Wed, 31 Aug 2011 19:35:11 +0200
Updated translations.
i18n/eric5_cs.ts | file | annotate | diff | comparison | revisions | |
i18n/eric5_de.qm | file | annotate | diff | comparison | revisions | |
i18n/eric5_de.ts | file | annotate | diff | comparison | revisions | |
i18n/eric5_en.ts | file | annotate | diff | comparison | revisions | |
i18n/eric5_es.ts | file | annotate | diff | comparison | revisions | |
i18n/eric5_fr.ts | file | annotate | diff | comparison | revisions | |
i18n/eric5_it.ts | file | annotate | diff | comparison | revisions | |
i18n/eric5_ru.ts | file | annotate | diff | comparison | revisions | |
i18n/eric5_tr.ts | file | annotate | diff | comparison | revisions | |
i18n/eric5_zh_CN.GB2312.ts | file | annotate | diff | comparison | revisions |
--- a/i18n/eric5_cs.ts Wed Aug 31 19:28:49 2011 +0200 +++ b/i18n/eric5_cs.ts Wed Aug 31 19:35:11 2011 +0200 @@ -1380,62 +1380,62 @@ <context> <name>Bookmarks</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="129"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="147"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="147"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="159"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="187"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="220"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="304"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="304"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="316"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="337"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="337"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="334"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="349"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -15619,212 +15619,212 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> <source>The hg process finished with the exit code {0}</source> <translation>hg proces skončil s exit kódem {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="234"/> <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/hg.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> <source>Create project repository</source> <translation>Vytvořit repozitář projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> <source>The project repository could not be created.</source> <translation>Úložiště projektu nelze vytvořit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> - <source>Creating Mercurial repository</source> - <translation>Vytváření Mercurial úložiště</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> + <source>Creating Mercurial repository</source> + <translation>Vytváření Mercurial úložiště</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> <source>Initial commit to Mercurial repository</source> <translation>Úvodní zápis změn (commit) do Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="331"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="351"/> <source>Cloning project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="427"/> <source>Commiting changes to Mercurial repository</source> - <translation>Zapsání změn (commit) do Mercurial úložiště</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="475"/> + <translation type="obsolete">Zapsání změn (commit) do Mercurial úložiště</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/> <source>Synchronizing with the Mercurial repository</source> <translation>Synchronizovat s Mercurial úložištěm</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="523"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="558"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Přidat soubory/složky do Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="622"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Odebrat soubory/složky z Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="686"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="746"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="791"/> <source>Taging in the Mercurial repository</source> <translation>Otagovat Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="776"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="869"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1047"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1224"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1298"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> <source>Mercurial Log</source> <translation>Mercurial log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> <source>Select number of entries to show.</source> <translation>Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1477"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> <source>Pulling from a remote Mercurial repository</source> <translation>Stažení (pull) z Mercurial repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1509"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1599"/> <source>Pushing to a remote Mercurial repository</source> <translation>Odeslání (push) do Mercurial repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source>Resolving files/directories</source> <translation>Vyřešení souborů/složek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source>Create Branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source>Enter branch name</source> <translation>Zadejte název větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1656"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> <source>Creating branch in the Mercurial repository</source> <translation>Vytvoření větve v Mercurial repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1736"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Ověřit integritu Mercurial repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1856"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <source>Showing aliases for remote repositories</source> <translation>Zobrazení aliasů pro vzdálené úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> <source>Shall the working directory be updated?</source> <translation>Má být pracovní adresář aktualizován?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1679"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2098"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2225"/> <source>Removing files from the Mercurial repository only</source> <translation>Odebrat soubory jen z Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -15834,40 +15834,60 @@ <translation type="obsolete"><p>Soubor Mercurial skupiny změn<b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2006"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2108"/> <source>Identifying changegroup file</source> <translation>Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2281"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> <source>No revision given. Aborting...</source> <translation>Nebyla dána žádná revize. Ruším...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2024"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2306"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="454"/> + <source>Committing changes to Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <source>Mercurial Command Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2344"/> + <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -15947,12 +15967,12 @@ <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="110"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="110"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <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> @@ -16325,17 +16345,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> <source>Process Generation Error</source> <translation type="unfinished">Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="165"/> <source>no bookmarks found</source> <translation type="unfinished"></translation> </message> @@ -16425,17 +16445,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> <source>Process Generation Error</source> <translation type="unfinished">Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="150"/> <source>no bookmarks defined</source> <translation type="unfinished"></translation> </message> @@ -16554,6 +16574,44 @@ </message> </context> <context> + <name>HgClient</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="76"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="117"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="119"/> + <source>Received data on unexpected channel.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="124"/> + <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="128"/> + <source>'capabilities' message did not contain any capability.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="136"/> + <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <source>'encoding' message did not contain any encoding.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/> @@ -16765,12 +16823,12 @@ <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> <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> @@ -16838,27 +16896,27 @@ <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/> <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/HgDiffDialog.py" line="178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="206"/> <source>There is no difference.</source> <translation>Žádné rozdíly nebyly nalezeny.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="347"/> <source>Save Diff</source> <translation>Uložit Diff</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="316"/> <source>Patch Files (*.diff)</source> <translation>Patch soubory (*.diff)</translation> </message> @@ -16868,17 +16926,17 @@ <translation type="obsolete"><p>Patch soubor <b>{0}</b> již existuje.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="347"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Patch soubor <b>{0}</b> nelze uložit.<br />Důvod: {1}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="289"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="333"/> <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/HgDiffDialog.py" line="109"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="112"/> <source>Patch Contents</source> <translation type="unfinished"></translation> </message> @@ -17077,7 +17135,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="310"/> <source>Revision</source> <translation type="unfinished">Revize</translation> </message> @@ -17152,17 +17210,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> <source>Process Generation Error</source> <translation type="unfinished">Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="147"/> <source>no signatures found</source> <translation type="unfinished"></translation> </message> @@ -17200,17 +17258,17 @@ <translation>Vybrat pole pro filtrování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1082"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/> <source>Revision</source> <translation>Revize</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1079"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1128"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> <source>Message</source> <translation>Zpráva</translation> </message> @@ -17335,42 +17393,42 @@ <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> <source>Added</source> <translation>Přidáno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="116"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Deleted</source> <translation>Smazáno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> <source>Modified</source> <translation>Změněno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> <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="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489"/> <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="473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="492"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="476"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> @@ -17410,7 +17468,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/> <source>All</source> <translation type="unfinished">Vše</translation> </message> @@ -17425,7 +17483,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> <source>Bookmarks</source> <translation type="unfinished">Záložky</translation> </message> @@ -17513,108 +17571,108 @@ <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="55"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="56"/> <source><b>Processing your request, please wait...</b></source> <translation><p>Zpracovávám váš požadavek, prosím čekejte...</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="66"/> <source>Revision</source> <translation>Revize</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> <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/HgLogDialog.py" line="225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="259"/> <source>No log available for '{0}'</source> <translation>Log není pro '{0}' dostupný</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> <source>diff to {0}</source> <translation>diff na {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> <source>Branches: {0}<br /> </source> <translation>Větve: {0}<br/> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="302"/> <source>Tags: {0}<br /> </source> <translation>Tagy: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/> <source>Parents: {0}<br /> </source> <translation>Rodiče: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Autor: {0}</i><br /></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="278"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Datum: {0}, {1}</i><br /></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> <source>Added {0}<br /> </source> <translation>Přidáno: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> <source>Modified {0}<br /> </source> <translation>Změněno: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="338"/> <source>Deleted {0}<br /> </source> <translation>Smazáno: {0}<br/></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="201"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="226"/> <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/HgLogDialog.py" line="203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="228"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="231"/> <source>Mercurial Error</source> <translation>Mercurial chyba</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="288"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Přidáno {0} (zkopírováno z {1})<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="271"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> @@ -19098,37 +19156,37 @@ <translation type="unfinished">Odebrat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> <source>Unsaved Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> <source>Remove Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> <source>Do you really want to remove the selected guards?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> <source>Apply Guard Definitions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/> <source>The Mercurial process did not finish in time.</source> <translation type="unfinished"></translation> </message> @@ -19202,17 +19260,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> <source>Process Generation Error</source> <translation type="unfinished">Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="189"/> <source>Error: </source> <translation type="unfinished"></translation> </message> @@ -19230,12 +19288,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="89"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="103"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="94"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> @@ -19320,42 +19378,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> <source>Process Generation Error</source> <translation type="unfinished">Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="219"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="50"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> <source>applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> - <source>guarded</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="53"/> + <source>guarded</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="54"/> <source>missing</source> <translation type="unfinished">chybějící</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="292"/> <source>unknown</source> <translation type="unfinished">neznámý</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> <source>not applied</source> <translation type="unfinished"></translation> </message> @@ -19393,7 +19451,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="111"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="122"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> @@ -19514,12 +19572,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="60"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="62"/> <source>Refresh</source> <translation type="unfinished">Obnovit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="62"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="64"/> <source>Press to refresh the queues list</source> <translation type="unfinished"></translation> </message> @@ -20027,7 +20085,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="188"/> <source>Mercurial Status</source> <translation>Mercurial status</translation> </message> @@ -20103,107 +20161,107 @@ <translation>Stisknout pro obnovení zobrazní statusu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="62"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="63"/> <source>Commit changes to repository...</source> <translation>Zapsat změny do repozitáře...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/> <source>Add to repository</source> <translation>Přidat do repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="71"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="72"/> <source>Revert changes</source> <translation>Vrátit změny</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="76"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="77"/> <source>Adjust column sizes</source> <translation>Přizpůsobit šířky sloupců</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>added</source> <translation>přidáno</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> - <source>modified</source> - <translation>změněno</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> - <source>removed</source> - <translation>odebráno</translation> + <source>modified</source> + <translation>změněno</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> - <source>not tracked</source> - <translation>nesledováno</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> - <source>normal</source> - <translation>normální</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> - <source>ignored</source> - <translation>ignorováno</translation> + <source>removed</source> + <translation>odebráno</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> + <source>not tracked</source> + <translation>nesledováno</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> + <source>normal</source> + <translation>normální</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> + <source>ignored</source> + <translation>ignorováno</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> <source>missing</source> <translation>chybějící</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="238"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="238"/> <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/HgStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="540"/> <source>Commit</source> <translation>Zapsat měny</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="642"/> <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="529"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="567"/> <source>Add</source> <translation>Přidat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="567"/> <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="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="625"/> <source>Revert</source> <translation>Vrátit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="69"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="70"/> <source>Remove from repository</source> <translation>Odebrat z repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="588"/> <source>Remove</source> <translation>Odebrat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="625"/> <source>There are no missing entries available/selected.</source> <translation>Chybějící záznamy nejsou dostupné/vybrány.</translation> </message> @@ -20278,17 +20336,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="68"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="74"/> <source>Restore missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="452"/> <source>all</source> <translation type="unfinished"></translation> </message> @@ -20298,12 +20356,12 @@ <translation type="obsolete">Odlišnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="642"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="540"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> @@ -20311,12 +20369,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="153"/> <source>Mercurial status checked successfully</source> <translation>Mercurial status úspěšně zkontrolován</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="119"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="100"/> <source>Could not start the Mercurial process.</source> <translation>Nelze spustit Mercurial proces.</translation> </message> @@ -20406,32 +20464,32 @@ <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="86"/> <source>Mercurial Branches List</source> <translation>Mercurial sezam větví</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="87"/> <source>Status</source> <translation>Status</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> <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/HgTagBranchListDialog.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="247"/> <source>active</source> <translation>aktivní</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="252"/> <source>yes</source> <translation>ano</translation> </message> @@ -27603,7 +27661,7 @@ <translation>Chcete editovat parametry VCS příkazu?</translation> </message> <message> - <location filename="Project/Project.py" line="2869"/> + <location filename="Project/Project.py" line="2874"/> <source>New project</source> <translation>Nový projekt</translation> </message> @@ -27618,7 +27676,7 @@ <translation>Výběr verzovacího systému projektu</translation> </message> <message> - <location filename="Project/Project.py" line="2882"/> + <location filename="Project/Project.py" line="2887"/> <source>Open project</source> <translation>Otevřít projekt</translation> </message> @@ -27633,7 +27691,7 @@ <translation>Soubory projektu (*.e4p)</translation> </message> <message> - <location filename="Project/Project.py" line="2916"/> + <location filename="Project/Project.py" line="2921"/> <source>Save project as</source> <translation>Uložit projekt jako</translation> </message> @@ -27672,587 +27730,587 @@ </translation> </message> <message> - <location filename="Project/Project.py" line="2869"/> + <location filename="Project/Project.py" line="2874"/> <source>&New...</source> <translation>&Nový...</translation> </message> <message> - <location filename="Project/Project.py" line="2873"/> + <location filename="Project/Project.py" line="2878"/> <source>Generate a new project</source> <translation>Vygenerovat nový projekt</translation> </message> <message> - <location filename="Project/Project.py" line="2874"/> + <location filename="Project/Project.py" line="2879"/> <source><b>New...</b><p>This opens a dialog for entering the info for a new project.</p></source> <translation><b>Nový...</b><p>Otevře se dialogové okno pro zadání informací o novém projektu.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2882"/> - <source>&Open...</source> - <translation>&Otevřít...</translation> - </message> - <message> - <location filename="Project/Project.py" line="2886"/> - <source>Open an existing project</source> - <translation>Otevřít existující projekt</translation> - </message> - <message> <location filename="Project/Project.py" line="2887"/> + <source>&Open...</source> + <translation>&Otevřít...</translation> + </message> + <message> + <location filename="Project/Project.py" line="2891"/> + <source>Open an existing project</source> + <translation>Otevřít existující projekt</translation> + </message> + <message> + <location filename="Project/Project.py" line="2892"/> <source><b>Open...</b><p>This opens an existing project.</p></source> <translation><b>Otevřít....</b><p>Otevře existující projekt.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2894"/> + <location filename="Project/Project.py" line="2899"/> <source>Close project</source> <translation>Zavřít projekt</translation> </message> <message> - <location filename="Project/Project.py" line="2894"/> + <location filename="Project/Project.py" line="2899"/> <source>&Close</source> <translation>&Zavřít</translation> </message> <message> - <location filename="Project/Project.py" line="2897"/> + <location filename="Project/Project.py" line="2902"/> <source>Close the current project</source> <translation>Uzavře aktuální projekt</translation> </message> <message> - <location filename="Project/Project.py" line="2898"/> + <location filename="Project/Project.py" line="2903"/> <source><b>Close</b><p>This closes the current project.</p></source> <translation><b>Zavřít</b><p>Aktuální projekt se uzavře.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2905"/> + <location filename="Project/Project.py" line="2910"/> <source>Save project</source> <translation>Uložit projekt</translation> </message> <message> - <location filename="Project/Project.py" line="3059"/> + <location filename="Project/Project.py" line="3064"/> <source>&Save</source> <translation>&Uložit</translation> </message> <message> - <location filename="Project/Project.py" line="2908"/> + <location filename="Project/Project.py" line="2913"/> <source>Save the current project</source> <translation>Uložit aktuální projekt</translation> </message> <message> - <location filename="Project/Project.py" line="2909"/> + <location filename="Project/Project.py" line="2914"/> <source><b>Save</b><p>This saves the current project.</p></source> <translation><b>Uložit</b><p>Aktuální projekt se uloží.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2916"/> + <location filename="Project/Project.py" line="2921"/> <source>Save &as...</source> <translation>Uložit j&ako...</translation> </message> <message> - <location filename="Project/Project.py" line="2919"/> + <location filename="Project/Project.py" line="2924"/> <source>Save the current project to a new file</source> <translation>Uloží aktuální projekt do nového souboru</translation> </message> <message> - <location filename="Project/Project.py" line="2920"/> + <location filename="Project/Project.py" line="2925"/> <source><b>Save as</b><p>This saves the current project to a new file.</p></source> <translation><b>Uložit jako</b><p>Uloží aktuální projekt do nového souboru.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2929"/> + <location filename="Project/Project.py" line="2934"/> <source>Add files to project</source> <translation>Přidat soubory do projektu</translation> </message> <message> - <location filename="Project/Project.py" line="2929"/> - <source>Add &files...</source> - <translation>&Přidat soubory...</translation> - </message> - <message> - <location filename="Project/Project.py" line="2933"/> - <source>Add files to the current project</source> - <translation>Přidat soubory do aktuálního projektu</translation> - </message> - <message> <location filename="Project/Project.py" line="2934"/> + <source>Add &files...</source> + <translation>&Přidat soubory...</translation> + </message> + <message> + <location filename="Project/Project.py" line="2938"/> + <source>Add files to the current project</source> + <translation>Přidat soubory do aktuálního projektu</translation> + </message> + <message> + <location filename="Project/Project.py" line="2939"/> <source><b>Add files...</b><p>This opens a dialog for adding files to the current project. The place to add is determined by the file extension.</p></source> <translation><b>Přidat soubory...</b><p>Otevře dialog pri přidání souborů do aktuálního projektu. Místo pro přidání je definováno extenzí souborů.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2943"/> + <location filename="Project/Project.py" line="2948"/> <source>Add directory to project</source> <translation>Přidat adresář do projektu</translation> </message> <message> - <location filename="Project/Project.py" line="2943"/> + <location filename="Project/Project.py" line="2948"/> <source>Add directory...</source> <translation>Přidat adresář...</translation> </message> <message> - <location filename="Project/Project.py" line="2947"/> + <location filename="Project/Project.py" line="2952"/> <source>Add a directory to the current project</source> <translation>Přidat adresář do aktuálního projektu</translation> </message> <message> - <location filename="Project/Project.py" line="2949"/> + <location filename="Project/Project.py" line="2954"/> <source><b>Add directory...</b><p>This opens a dialog for adding a directory to the current project.</p></source> <translation><b>Přidat adresář...</b><p>Otevře dialog pro přičtení adresáře do aktuálního projektu.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2957"/> + <location filename="Project/Project.py" line="2962"/> <source>Add translation to project</source> <translation>Přidat překlad do projektu</translation> </message> <message> - <location filename="Project/Project.py" line="2957"/> + <location filename="Project/Project.py" line="2962"/> <source>Add &translation...</source> <translation>Přida&t překlad...</translation> </message> <message> - <location filename="Project/Project.py" line="2961"/> + <location filename="Project/Project.py" line="2966"/> <source>Add a translation to the current project</source> <translation>Přidat překlad do aktuálního projektu</translation> </message> <message> - <location filename="Project/Project.py" line="2963"/> + <location filename="Project/Project.py" line="2968"/> <source><b>Add translation...</b><p>This opens a dialog for add a translation to the current project.</p></source> <translation><b>Přidat překlad</b><p>Otevře dialog pro přidání překladu do aktuálního projektu.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2971"/> + <location filename="Project/Project.py" line="2976"/> <source>Search new files</source> <translation>Hledat nové soubory</translation> </message> <message> - <location filename="Project/Project.py" line="2971"/> + <location filename="Project/Project.py" line="2976"/> <source>Searc&h new files...</source> <translation>&Hledat nové soubory...</translation> </message> <message> - <location filename="Project/Project.py" line="2974"/> + <location filename="Project/Project.py" line="2979"/> <source>Search new files in the project directory.</source> <translation>Hledat nové soubory v adresáři projektu.</translation> </message> <message> - <location filename="Project/Project.py" line="2975"/> + <location filename="Project/Project.py" line="2980"/> <source><b>Search new files...</b><p>This searches for new files (sources, *.ui, *.idl) in the project directory and registered subdirectories.</p></source> <translation><b>Hledat nové soubory...</b><p>Hledají se nové soubory (zdrojové, *.ui, *.idl) v adresáři projektu a v registrovaných podadresářích.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2983"/> + <location filename="Project/Project.py" line="2988"/> <source>Project properties</source> <translation>Nastavení projektu</translation> </message> <message> - <location filename="Project/Project.py" line="2983"/> + <location filename="Project/Project.py" line="2988"/> <source>&Properties...</source> <translation>&Natavení...</translation> </message> <message> - <location filename="Project/Project.py" line="2986"/> + <location filename="Project/Project.py" line="2991"/> <source>Show the project properties</source> <translation>Zobrazit nastavení projektu</translation> </message> <message> - <location filename="Project/Project.py" line="2987"/> + <location filename="Project/Project.py" line="2992"/> <source><b>Properties...</b><p>This shows a dialog to edit the project properties.</p></source> <translation><b>Nastavení...</b><p>Zobrazí dialog s editací nastavení projektu.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2994"/> - <source>User project properties</source> - <translation>Uživatelská nastavení projektu</translation> - </message> - <message> - <location filename="Project/Project.py" line="2994"/> - <source>&User Properties...</source> - <translation>Uživat&elská nastavení...</translation> - </message> - <message> - <location filename="Project/Project.py" line="2997"/> - <source>Show the user specific project properties</source> - <translation>Zobrazit uživatelem definovaná nastavení projektu</translation> - </message> - <message> <location filename="Project/Project.py" line="2999"/> + <source>User project properties</source> + <translation>Uživatelská nastavení projektu</translation> + </message> + <message> + <location filename="Project/Project.py" line="2999"/> + <source>&User Properties...</source> + <translation>Uživat&elská nastavení...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3002"/> + <source>Show the user specific project properties</source> + <translation>Zobrazit uživatelem definovaná nastavení projektu</translation> + </message> + <message> + <location filename="Project/Project.py" line="3004"/> <source><b>User Properties...</b><p>This shows a dialog to edit the user specific project properties.</p></source> <translation><b>Uživatelská nastavení...</b><p>Zobrazí dialog s editací uživatelských nastavení projektu.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3006"/> + <location filename="Project/Project.py" line="3011"/> <source>Filetype Associations</source> <translation>Asociace typů souborů</translation> </message> <message> - <location filename="Project/Project.py" line="3006"/> - <source>Filetype Associations...</source> - <translation>Asociace typů souborů...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3009"/> - <source>Show the project filetype associations</source> - <translation>Zobrazit asociace typů souborů</translation> - </message> - <message> <location filename="Project/Project.py" line="3011"/> + <source>Filetype Associations...</source> + <translation>Asociace typů souborů...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3014"/> + <source>Show the project filetype associations</source> + <translation>Zobrazit asociace typů souborů</translation> + </message> + <message> + <location filename="Project/Project.py" line="3016"/> <source><b>Filetype Associations...</b><p>This shows a dialog to edit the filetype associations of the project. These associations determine the type (source, form, interface or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.</p></source> <translation><b>Asociace typů souborů...</b><p>Zobrazí se dialog s editací asociace typů souborů v projektu. Na základě vzorku souborového jména tyto asociace určují typ souboru (zdrojový kód, formulář, interface nebo jiné). Tyto asociace jsou použity při přidávání souborů do projektu a při vyhledávání.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3037"/> + <location filename="Project/Project.py" line="3042"/> <source>Debugger Properties</source> <translation>Nastavení debugeru</translation> </message> <message> - <location filename="Project/Project.py" line="3037"/> + <location filename="Project/Project.py" line="3042"/> <source>Debugger &Properties...</source> <translation>Nastavení &debuggeru...</translation> </message> <message> - <location filename="Project/Project.py" line="3040"/> + <location filename="Project/Project.py" line="3045"/> <source>Show the debugger properties</source> <translation>Zobrazit nastavení debugeru</translation> </message> <message> - <location filename="Project/Project.py" line="3041"/> + <location filename="Project/Project.py" line="3046"/> <source><b>Debugger Properties...</b><p>This shows a dialog to edit project specific debugger settings.</p></source> <translation><b>Nastavení debugeru...</b><p>Zobrazí dialog s editací nastavení debugeru.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3048"/> + <location filename="Project/Project.py" line="3053"/> <source>Load</source> <translation>Načíst</translation> </message> <message> - <location filename="Project/Project.py" line="3048"/> + <location filename="Project/Project.py" line="3053"/> <source>&Load</source> <translation>&Načíst</translation> </message> <message> - <location filename="Project/Project.py" line="3051"/> + <location filename="Project/Project.py" line="3056"/> <source>Load the debugger properties</source> <translation>Načíst nastavení debugeru</translation> </message> <message> - <location filename="Project/Project.py" line="3052"/> + <location filename="Project/Project.py" line="3057"/> <source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source> <translation><b>Načíst nastavení debugeru</b><p>Načtou se nastavení debugeru do projektu.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3059"/> + <location filename="Project/Project.py" line="3064"/> <source>Save</source> <translation>Uložit</translation> </message> <message> - <location filename="Project/Project.py" line="3062"/> + <location filename="Project/Project.py" line="3067"/> <source>Save the debugger properties</source> <translation>Uložit nastavení debugeru</translation> </message> <message> - <location filename="Project/Project.py" line="3063"/> + <location filename="Project/Project.py" line="3068"/> <source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source> <translation><b>Uložit nastavení debugeru</b><p>Uloží nastavení debugeru definovaná v projektu..</p></translation> </message> <message> - <location filename="Project/Project.py" line="3070"/> + <location filename="Project/Project.py" line="3075"/> <source>Delete</source> <translation>Smazat</translation> </message> <message> - <location filename="Project/Project.py" line="3070"/> + <location filename="Project/Project.py" line="3075"/> <source>&Delete</source> <translation>Sma&zat</translation> </message> <message> - <location filename="Project/Project.py" line="3073"/> + <location filename="Project/Project.py" line="3078"/> <source>Delete the debugger properties</source> <translation>Smazat nastavení debugeru</translation> </message> <message> - <location filename="Project/Project.py" line="3074"/> + <location filename="Project/Project.py" line="3079"/> <source><b>Delete Debugger Properties</b><p>This deletes the file containing the project specific debugger settings.</p></source> <translation><b>Smazat nastavení debugeru</b><p>Smaže se soubor obsahující nastavení debugeru v daném projektu.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3082"/> + <location filename="Project/Project.py" line="3087"/> <source>Reset</source> <translation></translation> </message> <message> - <location filename="Project/Project.py" line="3082"/> + <location filename="Project/Project.py" line="3087"/> <source>&Reset</source> <translation>&Reset</translation> </message> <message> - <location filename="Project/Project.py" line="3085"/> + <location filename="Project/Project.py" line="3090"/> <source>Reset the debugger properties</source> <translation>Reset nastavení debugeru</translation> </message> <message> - <location filename="Project/Project.py" line="3086"/> + <location filename="Project/Project.py" line="3091"/> <source><b>Reset Debugger Properties</b><p>This resets the project specific debugger settings.</p></source> <translation><b>Reset nastavení debugeru</b><p>Zresetuje nastavení debugeru v projektu.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3095"/> + <location filename="Project/Project.py" line="3100"/> <source>Load session</source> <translation>Načíst relaci</translation> </message> <message> - <location filename="Project/Project.py" line="3098"/> + <location filename="Project/Project.py" line="3103"/> <source>Load the projects session file.</source> <translation>Načíst soubor s relací projektu.</translation> </message> <message> - <location filename="Project/Project.py" line="3099"/> + <location filename="Project/Project.py" line="3104"/> <source><b>Load session</b><p>This loads the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Načíst relaci</b><p>Načte soubor s relací projektu. Relace obsahuje následující údaje:<br>- všechny otevřené zdrojové soubory<br>- všechny breakpointy<br>- argumenty příkazové řádky <br>- pracovní adresář<br>- příznak výjimky</p></translation> </message> <message> - <location filename="Project/Project.py" line="3112"/> + <location filename="Project/Project.py" line="3117"/> <source>Save session</source> <translation>Uložit relaci</translation> </message> <message> - <location filename="Project/Project.py" line="3115"/> + <location filename="Project/Project.py" line="3120"/> <source>Save the projects session file.</source> <translation>Uložit soubor s relací projektu.</translation> </message> <message> - <location filename="Project/Project.py" line="3116"/> + <location filename="Project/Project.py" line="3121"/> <source><b>Save session</b><p>This saves the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Uložit relaci</b><p>Uloží soubor s relací projektu. Relace obsahuje následující údaje:<br>- všechny otevřené zdrojové soubory<br>- všechny breakpointy<br>- argumenty příkazové řádky <br>- pracovní adresář<br>- příznak výjimky</p></translation> </message> <message> - <location filename="Project/Project.py" line="3129"/> + <location filename="Project/Project.py" line="3134"/> <source>Delete session</source> <translation>Smazat relaci</translation> </message> <message> - <location filename="Project/Project.py" line="3132"/> + <location filename="Project/Project.py" line="3137"/> <source>Delete the projects session file.</source> <translation>Smaže soubor s relací projektu.</translation> </message> <message> - <location filename="Project/Project.py" line="3133"/> + <location filename="Project/Project.py" line="3138"/> <source><b>Delete session</b><p>This deletes the projects session file</p></source> <translation><b>Smazat relaci</b><p>Smaže soubor s relací projektu.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3142"/> - <source>Code Metrics</source> - <translation>Metriky kódu</translation> - </message> - <message> - <location filename="Project/Project.py" line="3142"/> - <source>&Code Metrics...</source> - <translation>Metriky &kódu...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3145"/> - <source>Show some code metrics for the project.</source> - <translation>Zobrazit metriky kódu projektu.</translation> - </message> - <message> <location filename="Project/Project.py" line="3147"/> + <source>Code Metrics</source> + <translation>Metriky kódu</translation> + </message> + <message> + <location filename="Project/Project.py" line="3147"/> + <source>&Code Metrics...</source> + <translation>Metriky &kódu...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3150"/> + <source>Show some code metrics for the project.</source> + <translation>Zobrazit metriky kódu projektu.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3152"/> <source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source> <translation><b>Metriky kódu...</b><p>Zobrazí se metriky kódu všech python souborů v projektu.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3154"/> + <location filename="Project/Project.py" line="3159"/> <source>Python Code Coverage</source> <translation>Pokrytí python kódu</translation> </message> <message> - <location filename="Project/Project.py" line="3154"/> - <source>Code Co&verage...</source> - <translation>Pokr&ytí kódu...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3157"/> - <source>Show code coverage information for the project.</source> - <translation>Zobrazit informace pokrytí kódu projektu.</translation> - </message> - <message> <location filename="Project/Project.py" line="3159"/> + <source>Code Co&verage...</source> + <translation>Pokr&ytí kódu...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3162"/> + <source>Show code coverage information for the project.</source> + <translation>Zobrazit informace pokrytí kódu projektu.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3164"/> <source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source> <translation><b>Pokrytí kódu...</b><p>Zobrazí informace o pokrytí kódu ve všech python souborech projektu.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3839"/> + <location filename="Project/Project.py" line="3844"/> <source>Profile Data</source> <translation>Profilovat data</translation> </message> <message> - <location filename="Project/Project.py" line="3167"/> - <source>&Profile Data...</source> - <translation>&Profilovat data...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3170"/> - <source>Show profiling data for the project.</source> - <translation>Zobrazit profilování dat projektu.</translation> - </message> - <message> <location filename="Project/Project.py" line="3172"/> + <source>&Profile Data...</source> + <translation>&Profilovat data...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3175"/> + <source>Show profiling data for the project.</source> + <translation>Zobrazit profilování dat projektu.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3177"/> <source><b>Profile Data...</b><p>This shows the profiling data for the project.</p></source> <translation><b>Profilovat data</b><p>Zobrazí se profilování dat projektu.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3892"/> + <location filename="Project/Project.py" line="3897"/> <source>Application Diagram</source> <translation>Diagram aplikace</translation> </message> <message> - <location filename="Project/Project.py" line="3179"/> - <source>&Application Diagram...</source> - <translation>Diagram &aplikace...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3182"/> - <source>Show a diagram of the project.</source> - <translation>Zobrazit diagram projektu.</translation> - </message> - <message> <location filename="Project/Project.py" line="3184"/> + <source>&Application Diagram...</source> + <translation>Diagram &aplikace...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3187"/> + <source>Show a diagram of the project.</source> + <translation>Zobrazit diagram projektu.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3189"/> <source><b>Application Diagram...</b><p>This shows a diagram of the project.</p></source> <translation><b>Diagram aplikace...</b><p>Zobrazí diagram projektu.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3256"/> - <source>&Project</source> - <translation>&Projekt</translation> - </message> - <message> - <location filename="Project/Project.py" line="3257"/> - <source>Open &Recent Projects</source> - <translation>Otevřít poslední p&rojekty</translation> - </message> - <message> - <location filename="Project/Project.py" line="3258"/> - <source>&Version Control</source> - <translation>Kontrola &verzí</translation> - </message> - <message> <location filename="Project/Project.py" line="3261"/> - <source>Chec&k</source> - <translation>Zkontro&lovat</translation> + <source>&Project</source> + <translation>&Projekt</translation> + </message> + <message> + <location filename="Project/Project.py" line="3262"/> + <source>Open &Recent Projects</source> + <translation>Otevřít poslední p&rojekty</translation> </message> <message> <location filename="Project/Project.py" line="3263"/> - <source>Sho&w</source> - <translation>Zo&brazit</translation> - </message> - <message> - <location filename="Project/Project.py" line="3264"/> - <source>&Diagrams</source> - <translation>&Diagramy</translation> - </message> - <message> - <location filename="Project/Project.py" line="3265"/> - <source>Session</source> - <translation>Relace</translation> + <source>&Version Control</source> + <translation>Kontrola &verzí</translation> </message> <message> <location filename="Project/Project.py" line="3266"/> - <source>Source &Documentation</source> - <translation>Zd&rojová dokumentace</translation> + <source>Chec&k</source> + <translation>Zkontro&lovat</translation> </message> <message> <location filename="Project/Project.py" line="3268"/> - <source>Debugger</source> - <translation></translation> + <source>Sho&w</source> + <translation>Zo&brazit</translation> </message> <message> <location filename="Project/Project.py" line="3269"/> + <source>&Diagrams</source> + <translation>&Diagramy</translation> + </message> + <message> + <location filename="Project/Project.py" line="3270"/> + <source>Session</source> + <translation>Relace</translation> + </message> + <message> + <location filename="Project/Project.py" line="3271"/> + <source>Source &Documentation</source> + <translation>Zd&rojová dokumentace</translation> + </message> + <message> + <location filename="Project/Project.py" line="3273"/> + <source>Debugger</source> + <translation></translation> + </message> + <message> + <location filename="Project/Project.py" line="3274"/> <source>Pac&kagers</source> <translation>Balíč&ky</translation> </message> <message> - <location filename="Project/Project.py" line="3371"/> + <location filename="Project/Project.py" line="3376"/> <source>Project</source> <translation>Projekt</translation> </message> <message> - <location filename="Project/Project.py" line="3432"/> + <location filename="Project/Project.py" line="3437"/> <source>&Clear</source> <translation>&Vyčistit</translation> </message> <message> - <location filename="Project/Project.py" line="3542"/> + <location filename="Project/Project.py" line="3547"/> <source>Search New Files</source> <translation>Hledat nové soubory</translation> </message> <message> - <location filename="Project/Project.py" line="3542"/> + <location filename="Project/Project.py" line="3547"/> <source>There were no new files found to be added.</source> <translation>Nebyly nalezeny žádné soubory, které je možné přidat.</translation> </message> <message> - <location filename="Project/Project.py" line="3680"/> + <location filename="Project/Project.py" line="3685"/> <source>Version Control System</source> <translation>Version Control System</translation> </message> <message> - <location filename="Project/Project.py" line="3772"/> + <location filename="Project/Project.py" line="3777"/> <source>Coverage Data</source> <translation>Datové pokrytí</translation> </message> <message> - <location filename="Project/Project.py" line="3818"/> + <location filename="Project/Project.py" line="3823"/> <source>There is no main script defined for the current project. Aborting</source> <translation>V aktuálním projektu nebyl určen hlavní skript. Zrušeno</translation> </message> <message> - <location filename="Project/Project.py" line="3793"/> + <location filename="Project/Project.py" line="3798"/> <source>Code Coverage</source> <translation>Pokrytí kódu</translation> </message> <message> - <location filename="Project/Project.py" line="3793"/> + <location filename="Project/Project.py" line="3798"/> <source>Please select a coverage file</source> <translation>Prosím, vyberte soubor pokrytí</translation> </message> <message> - <location filename="Project/Project.py" line="3839"/> + <location filename="Project/Project.py" line="3844"/> <source>Please select a profile file</source> <translation>Prosím, vyberte soubor s profilem</translation> </message> <message> - <location filename="Project/Project.py" line="3892"/> + <location filename="Project/Project.py" line="3897"/> <source>Include module names?</source> <translation>Včetně jmen modulů?</translation> </message> <message> - <location filename="Project/Project.py" line="4023"/> + <location filename="Project/Project.py" line="4028"/> <source>Create Package List</source> <translation>Vytvořit seznam balíčků</translation> </message> <message> - <location filename="Project/Project.py" line="3193"/> + <location filename="Project/Project.py" line="3198"/> <source>Create &Package List</source> <translation>Vytvořit seznam &balíčků</translation> </message> <message> - <location filename="Project/Project.py" line="4183"/> + <location filename="Project/Project.py" line="4188"/> <source>Create Plugin Archive</source> <translation>Vytvořit Plugin archiv</translation> </message> <message> - <location filename="Project/Project.py" line="3207"/> + <location filename="Project/Project.py" line="3212"/> <source>Create Plugin &Archive</source> <translation>Vytvořit Plugin &archiv</translation> </message> <message> - <location filename="Project/Project.py" line="3996"/> + <location filename="Project/Project.py" line="4001"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation><p>Soubor <b>PKGLIST</b> již existuje.</p><p>Přepsat jej?</p></translation> </message> <message> - <location filename="Project/Project.py" line="4040"/> + <location filename="Project/Project.py" line="4045"/> <source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source> <translation><p>Soubor <b>PKGLIST</b> neexistuje. Zrušeno...</p></translation> </message> <message> - <location filename="Project/Project.py" line="4048"/> + <location filename="Project/Project.py" line="4053"/> <source>The project does not have a main script defined. Aborting...</source> <translation>Projekt nemá definován hlavní skript. Zrušeno...</translation> </message> @@ -28277,12 +28335,12 @@ <translation>Zaregistrovat typ projektu</translation> </message> <message> - <location filename="Project/Project.py" line="3222"/> + <location filename="Project/Project.py" line="3227"/> <source>Create Plugin Archive (Snapshot)</source> <translation>Vytvořit archiv pluginů (snímek)</translation> </message> <message> - <location filename="Project/Project.py" line="3222"/> + <location filename="Project/Project.py" line="3227"/> <source>Create Plugin Archive (&Snapshot)</source> <translation>Vytvořit archiv pluginů (&snímek)</translation> </message> @@ -28302,22 +28360,22 @@ <translation>Zadejte vzor cesty pro soubory s překlady (použijte '%language%' na místě s kódem jazyka):</translation> </message> <message> - <location filename="Project/Project.py" line="3021"/> + <location filename="Project/Project.py" line="3026"/> <source>Lexer Associations</source> <translation>Spojení lexeru</translation> </message> <message> - <location filename="Project/Project.py" line="3021"/> - <source>Lexer Associations...</source> - <translation>Spojení lexeru...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3024"/> - <source>Show the project lexer associations (overriding defaults)</source> - <translation>Zobrazit spojení lexeru projektu (přepíše výchozí)</translation> - </message> - <message> <location filename="Project/Project.py" line="3026"/> + <source>Lexer Associations...</source> + <translation>Spojení lexeru...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3029"/> + <source>Show the project lexer associations (overriding defaults)</source> + <translation>Zobrazit spojení lexeru projektu (přepíše výchozí)</translation> + </message> + <message> + <location filename="Project/Project.py" line="3031"/> <source><b>Lexer Associations...</b><p>This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.</p></source> <translation><b>Spojení lexeru...</b><p>Zobrazuje dialog s editací spojení lexeru projektu. Tato spojení přepisují globální lexer spojení. Lexer je použit pro zvýraznění textu v editoru.</p></translation> </message> @@ -28487,72 +28545,72 @@ <translation type="obsolete"><p>Soubor <b>{0}</b> již existuje.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3197"/> + <location filename="Project/Project.py" line="3202"/> <source>Create an initial PKGLIST file for an eric5 plugin.</source> <translation>Vytvořit počáteční soubor PKGLIST pro eric5 plugin.</translation> </message> <message> - <location filename="Project/Project.py" line="3199"/> + <location filename="Project/Project.py" line="3204"/> <source><b>Create Package List</b><p>This creates an initial list of files to include in an eric5 plugin archive. The list is created from the project file.</p></source> <translation><b>Vytvořit seznam balíčků</b><p>Vytvoří počáteční seznam souborů pro vložení do eric5 plugin archivu. Seznam je vytvořen ze souboru projektu.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3211"/> + <location filename="Project/Project.py" line="3216"/> <source>Create an eric5 plugin archive file.</source> <translation>Vytvořit soubor eric5 plugin archivu.</translation> </message> <message> - <location filename="Project/Project.py" line="3213"/> + <location filename="Project/Project.py" line="3218"/> <source><b>Create Plugin Archive</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name.</p></source> <translation><b>Vytvořit Plugin archiv</b><p>Vytvoří soubor s eric5 plugin archivem za použití seznamu souborů daných v PKGLIST souboru. Jméno archivu je odvozeno ze jména hlavního skriptu.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3226"/> + <location filename="Project/Project.py" line="3231"/> <source>Create an eric5 plugin archive file (snapshot release).</source> <translation>Vytvoří se soubor eric5 plugin archívu (snímek vydání).</translation> </message> <message> - <location filename="Project/Project.py" line="3228"/> + <location filename="Project/Project.py" line="3233"/> <source><b>Create Plugin Archive (Snapshot)</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name. The version entry of the main script is modified to reflect a snapshot release.</p></source> <translation><b>Vytvořit Plugin archiv (Snímek)</b><p>Vytvoří soubor s eric5 plugin archivem za použití seznamu souborů daných v PKGLIST souboru. Údaj o verzi hlavního skriptu je změněn v souladu se snímkem vydání.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3671"/> + <location filename="Project/Project.py" line="3676"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Reverting override.</p><p>{1}</p></source> <translation><p>Vybrané VCS <b>{0}</b> nebylo nalezeno.<br/>Navrácení do původního stavu.</p><p>{1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="3680"/> + <location filename="Project/Project.py" line="3685"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Disabling version control.</p><p>{1}</p></source> <translation><p>Vybrané VCS <b>{0}</b> nebylo nalezeno.<br/>Kontrola verzí vypnuta.</p><p>{1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4023"/> + <location filename="Project/Project.py" line="4028"/> <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> <translation><p>Soubor <b>PKGLIST</b> nelze vytvořit.</p><p>Důvod: {0}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4060"/> + <location filename="Project/Project.py" line="4065"/> <source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source> <translation><p>Soubor <b>PKGLIST</b> nelze načíst.</p><p>Důvod: {0}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4071"/> + <location filename="Project/Project.py" line="4076"/> <source><p>The eric5 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation><p>Soubor s eric5 plugin archivem <b>{0}</b> nelze vytvořit. Zrušeno...</p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4091"/> + <location filename="Project/Project.py" line="4096"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation><p>Soubor <b>{0}</b> nelze uložit do archivu. Ingorováno.</p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4103"/> + <location filename="Project/Project.py" line="4108"/> <source><p>The eric5 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation><p>Soubor s eric5 plugin archivem <b>{0}</b> byl úspěšně vytvořen.</p></translation> </message> <message> - <location filename="Project/Project.py" line="4183"/> + <location filename="Project/Project.py" line="4188"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation><p>Plugin soubor <b>{0}</b> nelze přečíst.</p><p>Důvod: {1}</p></translation> </message> @@ -30246,22 +30304,22 @@ <context> <name>Purge</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="91"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="97"/> <source>Purge All Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="98"/> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="101"/> <source>Purge Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="102"/> <source>Do really want to delete files not tracked by Mercurial?</source> <translation type="unfinished"></translation> </message> @@ -32297,177 +32355,177 @@ <context> <name>Queues</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="256"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="276"/> <source>New Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="325"/> <source>Update Current Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="356"/> - <source>Pop Patches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="360"/> - <source>Push Patches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="364"/> - <source>Go to Patch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> - <source>Select Patch</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="376"/> + <source>Pop Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="380"/> + <source>Push Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="384"/> + <source>Go to Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="515"/> + <source>Select Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="396"/> <source>Select the target patch name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="515"/> <source>No patches to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="447"/> <source>Finish Applied Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="459"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="479"/> <source>Rename Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="501"/> <source>Select the patch to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="490"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="510"/> <source>Delete Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="535"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="555"/> <source>Fold Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="551"/> <source>No patches selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="535"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="555"/> <source>No patches available to be folded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="559"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="579"/> <source>List Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="559"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="579"/> <source>No patches available to list guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="594"/> - <source>Define Guards</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> - <source>No patches available to define guards for.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> - <source>Drop All Guards</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="614"/> + <source>Define Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <source>No patches available to define guards for.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <source>Drop All Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="634"/> <source>Select the patch to drop guards for (leave empty for the current patch):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="693"/> <source>Set Active Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="693"/> <source>No guards available to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="691"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="715"/> <source>Deactivate Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="753"/> <source>Create New Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="755"/> <source>Rename Active Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="757"/> - <source>Error while creating a new queue.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/> - <source>Error while renaming the active queue.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="787"/> - <source>Purge Queue</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="789"/> + <source>Error while creating a new queue.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="792"/> + <source>Error while renaming the active queue.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="819"/> + <source>Purge Queue</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="821"/> <source>Delete Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="823"/> <source>Activate Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="820"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="860"/> <source>Error while purging the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="862"/> <source>Error while deleting the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="864"/> <source>Error while setting the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="847"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="887"/> <source>Available Queues</source> <translation type="unfinished"></translation> </message> @@ -49382,30 +49440,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1168"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Rodič #{0}</b></td><td></td></tr><tr><td><b>Množina změn</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1668"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tagy</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1676"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Větve</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1116"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1184"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1214"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49416,23 +49474,23 @@ <translation><h3>Informace o repozitáře</h3><p><table><tr><td><b>Mercurial V.</b></td><td>{0}</td></tr><tr></tr><tr><td><b>URL</b></td><td>{1}</td></tr></table></p>{2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1566"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1662"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Množina změn</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1680"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Rodiče</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1683"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -49440,7 +49498,7 @@ <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_de.ts Wed Aug 31 19:28:49 2011 +0200 +++ b/i18n/eric5_de.ts Wed Aug 31 19:35:11 2011 +0200 @@ -1381,62 +1381,62 @@ <context> <name>Bookmarks</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="129"/> <source>Mercurial Bookmark</source> <translation>Mercurial Lesezeichen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="147"/> <source>Delete Bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="147"/> <source>Select the bookmark to be deleted:</source> <translation>Wähle das zu löschende Lesezeichen aus:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="159"/> <source>Delete Mercurial Bookmark</source> <translation>Mercurial Lesezeichen löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="187"/> <source>Rename Mercurial Bookmark</source> <translation>Mercurial Lesezeichen umbenennen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="220"/> <source>Move Mercurial Bookmark</source> <translation>Mercurial Lesezeichen verschieben</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="304"/> <source>Pull Bookmark</source> <translation>Lesezeichen herunterladen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="304"/> <source>Select the bookmark to be pulled:</source> <translation>Wähle das herunterzuladende Lesezeichen:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="316"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Lade Lesezeichen von einem entfernten Mercurial Repository herunter</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="337"/> <source>Push Bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="337"/> <source>Select the bookmark to be push:</source> <translation>Wähle das hochzuladende Lesezeichen:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="334"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="349"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Lade Lesezeichen zu einem entfernten Mercurial Repository hoch</translation> </message> @@ -15270,250 +15270,265 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> <source>The hg process finished with the exit code {0}</source> <translation>Der hg Prozess endete mit dem Code {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="234"/> <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/hg.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>Could not start the hg executable.</source> <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> <source>The project repository could not be created.</source> <translation>Das Projektrepository konnte nicht erzeugt werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> - <source>Creating Mercurial repository</source> - <translation>Lege Mercurial Repository an</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> + <source>Creating Mercurial repository</source> + <translation>Lege Mercurial Repository an</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> <source>Initial commit to Mercurial repository</source> <translation>Erstes Commit für das Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="331"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="351"/> <source>Cloning project from a Mercurial repository</source> <translation>Klone das Projekt aus dem Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="427"/> - <source>Commiting changes to Mercurial repository</source> - <translation>Pflege Änderungen in das Mercurial Repository ein</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="475"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/> <source>Synchronizing with the Mercurial repository</source> <translation>Gleiche mit dem Mercurial Repository ab</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="523"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="558"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Füge Dateien/Verzeichnisse dem Mercurial Repository hinzu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="622"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Lösche Dateien/Verzeichnisse aus dem Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="686"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="746"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="791"/> <source>Taging in the Mercurial repository</source> <translation>Marke im Mercurial Repository setzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="776"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="869"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1047"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> <source>Mercurial command</source> <translation>Mercurial Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1224"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1298"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> <source>Select number of entries to show.</source> <translation>Wähle Anzahl der anzuzeigenden Einträge.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1477"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> <source>Pulling from a remote Mercurial repository</source> <translation>Pull von einem entfernten Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1509"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1599"/> <source>Pushing to a remote Mercurial repository</source> <translation>Push in ein entferntes Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source>Resolving files/directories</source> <translation>Löse Dateien/Verzeichnisse auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source>Enter branch name</source> <translation>Gib den Zweignamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1656"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> <source>Creating branch in the Mercurial repository</source> <translation>Erzeuge Zweig im Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1736"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verifiziere die Integrität des Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1856"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <source>Showing aliases for remote repositories</source> <translation>Zeige Namen für entfernte Repositories</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> <source>Shall the working directory be updated?</source> <translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1679"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> - <source>Mercurial Bisect ({0})</source> - <translation>Mercurial Bisect ({0})</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> - <source>Preview changegroup</source> - <translation>Änderungsgruppe ansehen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> - <source>Identifying project directory</source> - <translation>Projektverzeichnis identifizieren</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> - <source>Create .hgignore file</source> - <translation>.hgignore Datei erstellen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> - <source>Removing files from the Mercurial repository only</source> - <translation>Lösche Dateien nur aus dem Mercurial Repository</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation>Mercurial Änderungsgruppendateien (*.hg)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> - <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> - <translation>Mercurial Änderungsgruppendateien (*.hg);;Alle Dateien (*)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2006"/> - <source>Identifying changegroup file</source> - <translation>Identifiziere Änderungsgruppendatei</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> - <source>Backing out changeset</source> - <translation>Änderungssatz umkehren</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <source>Mercurial Bisect ({0})</source> + <translation>Mercurial Bisect ({0})</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2098"/> + <source>Preview changegroup</source> + <translation>Änderungsgruppe ansehen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <source>Identifying project directory</source> + <translation>Projektverzeichnis identifizieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <source>Create .hgignore file</source> + <translation>.hgignore Datei erstellen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2225"/> + <source>Removing files from the Mercurial repository only</source> + <translation>Lösche Dateien nur aus dem Mercurial Repository</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation>Mercurial Änderungsgruppendateien (*.hg)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> + <translation>Mercurial Änderungsgruppendateien (*.hg);;Alle Dateien (*)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2108"/> + <source>Identifying changegroup file</source> + <translation>Identifiziere Änderungsgruppendatei</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2281"/> + <source>Backing out changeset</source> + <translation>Änderungssatz umkehren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2024"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Mercurial Änderungsgruppendatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2306"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="454"/> + <source>Committing changes to Mercurial repository</source> + <translation>Pflege Änderungen in das Mercurial Repository ein</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <source>Mercurial Command Server</source> + <translation>Mercurial Befehlsserver</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2344"/> + <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> + <translation><p>Der Mercurial Befehlsserver konnte nicht wiedergestartet werden.</p><p>Ursache: {0}</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> + <translation><p>Der Mercurial Befehlsserver konnte nicht gestartet werden.</p><p>Ursache: {0}</p></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -15593,12 +15608,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="110"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="110"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <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> @@ -15972,17 +15987,17 @@ <translation>Ausgehende Mercurial Lesezeichen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> <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/BookmarksExtension/HgBookmarksInOutDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="165"/> <source>no bookmarks found</source> <translation>keine Lesezeichen vorhanden</translation> </message> @@ -16074,17 +16089,17 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> <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/BookmarksExtension/HgBookmarksListDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="150"/> <source>no bookmarks defined</source> <translation>keine Lesezeichen vorhanden</translation> </message> @@ -16203,6 +16218,44 @@ </message> </context> <context> + <name>HgClient</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="76"/> + <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/HgClient.py" line="117"/> + <source>Did not receive the 'hello' message.</source> + <translation>'Hallo' Nachricht konnte nicht empfangen werden.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="119"/> + <source>Received data on unexpected channel.</source> + <translation>Daten auf unerwartetem Kanal empfangen.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="124"/> + <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> + <translation>Ungültige 'Hallo' Nachricht; Erwartete 'capabilities: ', empfing jedoch '{0}'.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="128"/> + <source>'capabilities' message did not contain any capability.</source> + <translation>'capabilities' Nachricht enthielt keine Fähigkeiten.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="136"/> + <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> + <translation>Ungültige 'Hallo' Nachricht; Erwartete 'encoding: ', empfing jedoch '{0}'.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <source>'encoding' message did not contain any encoding.</source> + <translation>'encoding' Nachricht enthielt keine Kodierung.</translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/> @@ -16420,12 +16473,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> <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> @@ -16493,42 +16546,42 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/> <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/HgDiffDialog.py" line="178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="206"/> <source>There is no difference.</source> <translation>Es gibt keinen Unterschied.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="347"/> <source>Save Diff</source> <translation>Diff speichern</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="316"/> <source>Patch Files (*.diff)</source> <translation>Patchdateien (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="347"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Die Patchdatei <b>{0}</b> konnte nicht gespeichert werden.<br>Grund: {1}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="289"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="333"/> <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/HgDiffDialog.py" line="109"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="112"/> <source>Patch Contents</source> <translation>Patchinhalt</translation> </message> @@ -16727,7 +16780,7 @@ <translation>Wähle die als Filter zu verwendende Kategorie</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="310"/> <source>Revision</source> <translation>Revision</translation> </message> @@ -16802,17 +16855,17 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> <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/GpgExtension/HgGpgSignaturesDialog.py" line="128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="147"/> <source>no signatures found</source> <translation>keine Signaturen gefunden</translation> </message> @@ -16850,17 +16903,17 @@ <translation>Wähle das als Filter zu verwendende Feld</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1082"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/> <source>Revision</source> <translation>Revision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1079"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1128"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> <source>Message</source> <translation>Nachricht</translation> </message> @@ -16975,42 +17028,42 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> <source>Added</source> <translation>Hinzugefügt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="116"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Deleted</source> <translation>Gelöscht</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> <source>Modified</source> <translation>Modifiziert</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> <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="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489"/> <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="473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="492"/> <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="476"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> <source>Mercurial Error</source> <translation>Mercurial Fehler</translation> </message> @@ -17060,7 +17113,7 @@ <translation>Wähle den als Filter zu verwendenden Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/> <source>All</source> <translation>Alle</translation> </message> @@ -17075,7 +17128,7 @@ <translation>Mercurial Log (Ausgang)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> <source>Bookmarks</source> <translation>Lesezeichen</translation> </message> @@ -17158,114 +17211,114 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="55"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="56"/> <source><b>Processing your request, please wait...</b></source> <translation><b>Verarbeite ihre Anfrage, bitte warten...</b></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="66"/> <source>Revision</source> <translation>Revision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> <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/HgLogDialog.py" line="225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="259"/> <source>No log available for '{0}'</source> <translation>Kein Log für '{0}' verfügbar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> <source>diff to {0}</source> <translation>Unterschied zu {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> <source>Branches: {0}<br /> </source> <translation>Zweige: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="302"/> <source>Tags: {0}<br /> </source> <translation>Marken: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/> <source>Parents: {0}<br /> </source> <translation>Vorgänger: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Autor: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="278"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Datum: {0}, {1}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> <source>Added {0}<br /> </source> <translation>Hinzugefügt: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> <source>Modified {0}<br /> </source> <translation>Modifiziert: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="338"/> <source>Deleted {0}<br /> </source> <translation>Gelöscht: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="201"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="226"/> <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/HgLogDialog.py" line="203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="228"/> <source>Could not start the hg executable.</source> <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="231"/> <source>Mercurial Error</source> <translation>Mercurial Fehler</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="288"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Hinzugefügt: {0} (kopiert von {1})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="271"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> <source>Bookmarks: {0}<br /> </source> <translation>Lesezeichen: {0}<br /> @@ -18717,37 +18770,37 @@ <translation>Entfernen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> <source>Unsaved Changes</source> <translation>Nicht gesicherte Änderungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation>Die Liste der Guards wurde verändert. Sollen die Änderungen angewendet werden?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> <source>Remove Guards</source> <translation>Guards löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> <source>Do you really want to remove the selected guards?</source> <translation>Sollen die ausgewählten Guards wirklich gelöscht werden?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> <source>Apply Guard Definitions</source> <translation>Guard Definitionen anlegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation><p>Die definierten Guards konnten nicht angelegt werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/> <source>The Mercurial process did not finish in time.</source> <translation>Der Mercurial Prozess endete nicht zeitgerecht.</translation> </message> @@ -18821,17 +18874,17 @@ <translation>Änderungsbeschreibung</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> <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/QueuesExtension/HgQueuesHeaderDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="189"/> <source>Error: </source> <translation>Fehler:</translation> </message> @@ -18849,12 +18902,12 @@ <translation>Zeigt alle Guards aller Patches</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="89"/> <source>Unguarded</source> <translation>Ungesichert</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="103"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="94"/> <source>no patches found</source> <translation>keine Patches gefunden</translation> </message> @@ -18941,42 +18994,42 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> <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/QueuesExtension/HgQueuesListDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="219"/> <source>no patches found</source> <translation>keine Patches gefunden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="50"/> - <source>applied</source> - <translation>angewandt</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> - <source>not applied</source> - <translation>nicht angewandt</translation> + <source>applied</source> + <translation>angewandt</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> - <source>guarded</source> - <translation>geschützt</translation> + <source>not applied</source> + <translation>nicht angewandt</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="53"/> + <source>guarded</source> + <translation>geschützt</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="54"/> <source>missing</source> <translation>fehlt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="292"/> <source>unknown</source> <translation>unbekannt</translation> </message> @@ -19014,7 +19067,7 @@ <translation>Dies zeigt die Liste aller für den ausgewählten Patch zu definierenden Guards an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="111"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="122"/> <source>Unguarded</source> <translation>Ungesichert</translation> </message> @@ -19130,12 +19183,12 @@ <translation>Dies zeigt eine Liste verfügbarere Patchschlangen (aktive Patchschlange fett)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="60"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="62"/> <source>Refresh</source> <translation>Erneuern</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="62"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="64"/> <source>Press to refresh the queues list</source> <translation>Drücken, um die Liste der Patchschlangen zu erneuern</translation> </message> @@ -19643,7 +19696,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="188"/> <source>Mercurial Status</source> <translation>Mercurial Status</translation> </message> @@ -19720,107 +19773,107 @@ <translation>Drücken, um die Statusanzeige zu erneuern</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="62"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="63"/> <source>Commit changes to repository...</source> <translation>Änderungen einpflegen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/> <source>Add to repository</source> <translation>Zum Repository hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="71"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="72"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="76"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="77"/> <source>Adjust column sizes</source> <translation>Spaltengrößen anpassen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>added</source> <translation>hinzugefügt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> - <source>modified</source> - <translation>modifiziert</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> - <source>removed</source> - <translation>gelöscht</translation> + <source>modified</source> + <translation>modifiziert</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> - <source>not tracked</source> - <translation>nicht versioniert</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> - <source>normal</source> - <translation>normal</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> - <source>ignored</source> - <translation>ignoriert</translation> + <source>removed</source> + <translation>gelöscht</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> + <source>not tracked</source> + <translation>nicht versioniert</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> + <source>normal</source> + <translation>normal</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> + <source>ignored</source> + <translation>ignoriert</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> <source>missing</source> <translation>fehlt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="238"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="238"/> <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/HgStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="540"/> <source>Commit</source> <translation>Einpflegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="642"/> <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="529"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="567"/> <source>Add</source> <translation>Hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="567"/> <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="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="625"/> <source>Revert</source> <translation>Rückgängig machen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="69"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="70"/> <source>Remove from repository</source> <translation>Vom Repository löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="588"/> <source>Remove</source> <translation>Entfernen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="625"/> <source>There are no missing entries available/selected.</source> <translation>Es sind keine fehlenden Einträge vorhanden/ausgewählt.</translation> </message> @@ -19895,27 +19948,27 @@ <translation>&Wiederherstellen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="68"/> <source>Show differences</source> <translation>Unterschiede anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="74"/> <source>Restore missing</source> <translation>Fehlende wiederherstellen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="452"/> <source>all</source> <translation>alle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="642"/> <source>Differences</source> <translation>Unterschiede</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="540"/> <source>There are no entries selected to be committed.</source> <translation>Es sind keine Einträge zum Einpflegen ausgewählt.</translation> </message> @@ -19923,12 +19976,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="153"/> <source>Mercurial status checked successfully</source> <translation>Mercurial Status erfolgreich überprüft</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="119"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="100"/> <source>Could not start the Mercurial process.</source> <translation>Der Mercurial Prozess konnte nicht gestartet werden.</translation> </message> @@ -20020,32 +20073,32 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="86"/> <source>Mercurial Branches List</source> <translation>Mercurial Zweigliste</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="87"/> <source>Status</source> <translation>Status</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> <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/HgTagBranchListDialog.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="247"/> <source>active</source> <translation>aktiv</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="252"/> <source>yes</source> <translation>ja</translation> </message> @@ -26864,12 +26917,12 @@ <translation>Projektverzeichnis erstellen</translation> </message> <message> - <location filename="Project/Project.py" line="2882"/> + <location filename="Project/Project.py" line="2887"/> <source>Open project</source> <translation>Projekt öffnen</translation> </message> <message> - <location filename="Project/Project.py" line="2916"/> + <location filename="Project/Project.py" line="2921"/> <source>Save project as</source> <translation>Projekt speichern unter</translation> </message> @@ -26889,132 +26942,132 @@ <translation>Das aktuelle Projekt hat ungesicherte Änderungen.</translation> </message> <message> - <location filename="Project/Project.py" line="3059"/> + <location filename="Project/Project.py" line="3064"/> <source>&Save</source> <translation>&Speichern</translation> </message> <message> - <location filename="Project/Project.py" line="2869"/> + <location filename="Project/Project.py" line="2874"/> <source>New project</source> <translation>Neues Projekt</translation> </message> <message> - <location filename="Project/Project.py" line="2869"/> - <source>&New...</source> - <translation>&Neu...</translation> - </message> - <message> - <location filename="Project/Project.py" line="2873"/> - <source>Generate a new project</source> - <translation>Erstelle ein neues Projekt</translation> - </message> - <message> <location filename="Project/Project.py" line="2874"/> + <source>&New...</source> + <translation>&Neu...</translation> + </message> + <message> + <location filename="Project/Project.py" line="2878"/> + <source>Generate a new project</source> + <translation>Erstelle ein neues Projekt</translation> + </message> + <message> + <location filename="Project/Project.py" line="2879"/> <source><b>New...</b><p>This opens a dialog for entering the info for a new project.</p></source> <translation><b>Neu...</b><p>Dies öffnet einen Dialog zur Eingabe der Informationen des neuen Projektes.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2882"/> - <source>&Open...</source> - <translation>&Öffnen...</translation> - </message> - <message> - <location filename="Project/Project.py" line="2886"/> - <source>Open an existing project</source> - <translation>Öffnet ein bestehendes Projekt</translation> - </message> - <message> <location filename="Project/Project.py" line="2887"/> + <source>&Open...</source> + <translation>&Öffnen...</translation> + </message> + <message> + <location filename="Project/Project.py" line="2891"/> + <source>Open an existing project</source> + <translation>Öffnet ein bestehendes Projekt</translation> + </message> + <message> + <location filename="Project/Project.py" line="2892"/> <source><b>Open...</b><p>This opens an existing project.</p></source> <translation><b>Öffnen...</b><p>Dies öffnet ein bestehendes Projekt.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2894"/> + <location filename="Project/Project.py" line="2899"/> <source>Close project</source> <translation>Projekt schließen</translation> </message> <message> - <location filename="Project/Project.py" line="2894"/> + <location filename="Project/Project.py" line="2899"/> <source>&Close</source> <translation>Schl&ießen</translation> </message> <message> - <location filename="Project/Project.py" line="2897"/> + <location filename="Project/Project.py" line="2902"/> <source>Close the current project</source> <translation>Schließt das aktuelle Projekt</translation> </message> <message> - <location filename="Project/Project.py" line="2898"/> + <location filename="Project/Project.py" line="2903"/> <source><b>Close</b><p>This closes the current project.</p></source> <translation><b>Schließen</b><p>Dies schließt das aktuelle Projekt.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2905"/> + <location filename="Project/Project.py" line="2910"/> <source>Save project</source> <translation>Projekt speichern</translation> </message> <message> - <location filename="Project/Project.py" line="2908"/> + <location filename="Project/Project.py" line="2913"/> <source>Save the current project</source> <translation>Speichert das aktuelle Projekt</translation> </message> <message> - <location filename="Project/Project.py" line="2909"/> + <location filename="Project/Project.py" line="2914"/> <source><b>Save</b><p>This saves the current project.</p></source> <translation><b>Speichern</b><p>Dies speichert das aktuelle Projekt.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2919"/> + <location filename="Project/Project.py" line="2924"/> <source>Save the current project to a new file</source> <translation>Speichert das aktuelle Projekt in eine neue Datei</translation> </message> <message> - <location filename="Project/Project.py" line="2920"/> + <location filename="Project/Project.py" line="2925"/> <source><b>Save as</b><p>This saves the current project to a new file.</p></source> <translation><b>Speichern unter</b><p>Dies speichert das aktuelle Projekt in eine neue Datei.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2957"/> + <location filename="Project/Project.py" line="2962"/> <source>Add translation to project</source> <translation>Übersetzung zum Projekt hinzufügen</translation> </message> <message> - <location filename="Project/Project.py" line="2957"/> + <location filename="Project/Project.py" line="2962"/> <source>Add &translation...</source> <translation>&Übersetzung hinzufügen...</translation> </message> <message> - <location filename="Project/Project.py" line="2961"/> + <location filename="Project/Project.py" line="2966"/> <source>Add a translation to the current project</source> <translation>Eine Übersetzung zum aktuellen Projekt hinzufügen</translation> </message> <message> - <location filename="Project/Project.py" line="2963"/> + <location filename="Project/Project.py" line="2968"/> <source><b>Add translation...</b><p>This opens a dialog for add a translation to the current project.</p></source> <translation><b>Übersetzung hinzufügen...</b><p>Dies öffnet einen Dialog, mit dem eine Übersetzung zum aktuellen Projekt hinzugefügt werden kann.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2983"/> + <location filename="Project/Project.py" line="2988"/> <source>Project properties</source> <translation>Projekt Eigenschaften</translation> </message> <message> - <location filename="Project/Project.py" line="2983"/> + <location filename="Project/Project.py" line="2988"/> <source>&Properties...</source> <translation>&Eigenschaften...</translation> </message> <message> - <location filename="Project/Project.py" line="2986"/> + <location filename="Project/Project.py" line="2991"/> <source>Show the project properties</source> <translation>Zeigt die Projekt Eigenschaften an</translation> </message> <message> - <location filename="Project/Project.py" line="2987"/> + <location filename="Project/Project.py" line="2992"/> <source><b>Properties...</b><p>This shows a dialog to edit the project properties.</p></source> <translation><b>Eigenschaften...</b><p>Dies zeigt einen Dialog an, mit dem die Projekt Eigenschaften bearbeitet werden können.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3257"/> + <location filename="Project/Project.py" line="3262"/> <source>Open &Recent Projects</source> <translation>Zu&letzt geöffnete Projekte</translation> </message> @@ -27024,17 +27077,17 @@ <translation>Das Zielverzeichnis darf nicht leer sein.</translation> </message> <message> - <location filename="Project/Project.py" line="2971"/> + <location filename="Project/Project.py" line="2976"/> <source>Search new files</source> <translation>Neue Dateien suchen</translation> </message> <message> - <location filename="Project/Project.py" line="2971"/> + <location filename="Project/Project.py" line="2976"/> <source>Searc&h new files...</source> <translation>Neue &Dateien suchen...</translation> </message> <message> - <location filename="Project/Project.py" line="2974"/> + <location filename="Project/Project.py" line="2979"/> <source>Search new files in the project directory.</source> <translation>Sucht neue Dateien im Projektverzeichnis.</translation> </message> @@ -27054,22 +27107,22 @@ <translation>Sprache hinzufügen</translation> </message> <message> - <location filename="Project/Project.py" line="2916"/> + <location filename="Project/Project.py" line="2921"/> <source>Save &as...</source> <translation>Speichern &unter...</translation> </message> <message> - <location filename="Project/Project.py" line="3680"/> + <location filename="Project/Project.py" line="3685"/> <source>Version Control System</source> <translation>Versionskontrollsystem</translation> </message> <message> - <location filename="Project/Project.py" line="3542"/> + <location filename="Project/Project.py" line="3547"/> <source>Search New Files</source> <translation>Neue Dateien suchen</translation> </message> <message> - <location filename="Project/Project.py" line="3542"/> + <location filename="Project/Project.py" line="3547"/> <source>There were no new files found to be added.</source> <translation>Es wurden keine neuen Dateien gefunden.</translation> </message> @@ -27089,147 +27142,147 @@ <translation>Projekt Session speichern</translation> </message> <message> - <location filename="Project/Project.py" line="3095"/> + <location filename="Project/Project.py" line="3100"/> <source>Load session</source> <translation>Session laden</translation> </message> <message> - <location filename="Project/Project.py" line="3098"/> + <location filename="Project/Project.py" line="3103"/> <source>Load the projects session file.</source> <translation>Laden der Projekt Session.</translation> </message> <message> - <location filename="Project/Project.py" line="3112"/> + <location filename="Project/Project.py" line="3117"/> <source>Save session</source> <translation>Session speichern</translation> </message> <message> - <location filename="Project/Project.py" line="3115"/> + <location filename="Project/Project.py" line="3120"/> <source>Save the projects session file.</source> <translation>Speichern der Projekt Session.</translation> </message> <message> - <location filename="Project/Project.py" line="3099"/> + <location filename="Project/Project.py" line="3104"/> <source><b>Load session</b><p>This loads the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Session laden</b><p>Dies lädt eine Projekt Session Datei. Die Session enthält die folgenden Daten.<br>- alle offenen Quelltextdateien<br>- alle Haltepunkte<br>- die Kommandozeilenparameter<br>- das Arbeitsverzeichnis<br>- das Ausnahmemeldungsflag</p></translation> </message> <message> - <location filename="Project/Project.py" line="3116"/> + <location filename="Project/Project.py" line="3121"/> <source><b>Save session</b><p>This saves the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Session speichern</b><p>Dies speichert eine Projekt Session Datei. Die Session enthält die folgenden Daten.<br>- alle offenen Quelltextdateien<br>- alle Haltepunkte<br>- die Kommandozeilenparameter<br>- das Arbeitsverzeichnis<br>- das Ausnahmemeldungsflag</p></translation> </message> <message> + <location filename="Project/Project.py" line="3271"/> + <source>Source &Documentation</source> + <translation>&Quelltextdokumentation</translation> + </message> + <message> <location filename="Project/Project.py" line="3266"/> - <source>Source &Documentation</source> - <translation>&Quelltextdokumentation</translation> - </message> - <message> - <location filename="Project/Project.py" line="3261"/> <source>Chec&k</source> <translation>&Prüfen</translation> </message> <message> - <location filename="Project/Project.py" line="3142"/> + <location filename="Project/Project.py" line="3147"/> <source>Code Metrics</source> <translation>Quelltext Metriken</translation> </message> <message> - <location filename="Project/Project.py" line="3142"/> - <source>&Code Metrics...</source> - <translation>&Quelltext Metriken...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3145"/> - <source>Show some code metrics for the project.</source> - <translation>Zeige einige Quelltext Metriken für das Projekt.</translation> - </message> - <message> <location filename="Project/Project.py" line="3147"/> + <source>&Code Metrics...</source> + <translation>&Quelltext Metriken...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3150"/> + <source>Show some code metrics for the project.</source> + <translation>Zeige einige Quelltext Metriken für das Projekt.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3152"/> <source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source> <translation><b>Quelltext Metriken...</b><p>Dies zeigt einige Quelltext Metriken für alle Python Dateien des Projektes.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3154"/> - <source>Python Code Coverage</source> - <translation>Python Quelltext Abdeckung</translation> - </message> - <message> - <location filename="Project/Project.py" line="3154"/> - <source>Code Co&verage...</source> - <translation>&Quelltext Abdeckung...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3157"/> - <source>Show code coverage information for the project.</source> - <translation>Zeige die Quelltextabdeckung für das Projekt.</translation> - </message> - <message> <location filename="Project/Project.py" line="3159"/> + <source>Python Code Coverage</source> + <translation>Python Quelltext Abdeckung</translation> + </message> + <message> + <location filename="Project/Project.py" line="3159"/> + <source>Code Co&verage...</source> + <translation>&Quelltext Abdeckung...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3162"/> + <source>Show code coverage information for the project.</source> + <translation>Zeige die Quelltextabdeckung für das Projekt.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3164"/> <source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source> <translation><b>Quelltext Abdeckung...</b><p>Dies zeigt die Quelltextabdeckung für alle Python Dateien des Projektes an.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3839"/> + <location filename="Project/Project.py" line="3844"/> <source>Profile Data</source> <translation>Profildaten</translation> </message> <message> - <location filename="Project/Project.py" line="3167"/> - <source>&Profile Data...</source> - <translation>&Profildaten...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3170"/> - <source>Show profiling data for the project.</source> - <translation>Zeige Profildaten des aktuellen Projektes.</translation> - </message> - <message> <location filename="Project/Project.py" line="3172"/> + <source>&Profile Data...</source> + <translation>&Profildaten...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3175"/> + <source>Show profiling data for the project.</source> + <translation>Zeige Profildaten des aktuellen Projektes.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3177"/> <source><b>Profile Data...</b><p>This shows the profiling data for the project.</p></source> <translation><b>Profildaten...</b><p>Dies zeigt die Profildaten des Projektes.</p></translation> </message> <message> + <location filename="Project/Project.py" line="3268"/> + <source>Sho&w</source> + <translation>&Zeige</translation> + </message> + <message> + <location filename="Project/Project.py" line="3823"/> + <source>There is no main script defined for the current project. Aborting</source> + <translation>Für das aktuelle Projekt ist kein Hauptskript festgelegt. Abbruch</translation> + </message> + <message> + <location filename="Project/Project.py" line="3777"/> + <source>Coverage Data</source> + <translation>Quelltext Abdeckungsdaten</translation> + </message> + <message> <location filename="Project/Project.py" line="3263"/> - <source>Sho&w</source> - <translation>&Zeige</translation> - </message> - <message> - <location filename="Project/Project.py" line="3818"/> - <source>There is no main script defined for the current project. Aborting</source> - <translation>Für das aktuelle Projekt ist kein Hauptskript festgelegt. Abbruch</translation> - </message> - <message> - <location filename="Project/Project.py" line="3772"/> - <source>Coverage Data</source> - <translation>Quelltext Abdeckungsdaten</translation> - </message> - <message> - <location filename="Project/Project.py" line="3258"/> <source>&Version Control</source> <translation>&Versionskontrolle</translation> </message> <message> - <location filename="Project/Project.py" line="3892"/> + <location filename="Project/Project.py" line="3897"/> <source>Application Diagram</source> <translation>Applikations-Diagramm</translation> </message> <message> - <location filename="Project/Project.py" line="3179"/> - <source>&Application Diagram...</source> - <translation>&Applikations-Diagramm...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3182"/> - <source>Show a diagram of the project.</source> - <translation>Zeigt ein Diagramm des Projektes.</translation> - </message> - <message> <location filename="Project/Project.py" line="3184"/> + <source>&Application Diagram...</source> + <translation>&Applikations-Diagramm...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3187"/> + <source>Show a diagram of the project.</source> + <translation>Zeigt ein Diagramm des Projektes.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3189"/> <source><b>Application Diagram...</b><p>This shows a diagram of the project.</p></source> <translation><b>Applikations-Diagramm...</b><p>Dies zeigt ein Diagramm des Projektes.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3264"/> + <location filename="Project/Project.py" line="3269"/> <source>&Diagrams</source> <translation>&Diagramme</translation> </message> @@ -27239,37 +27292,37 @@ <translation>Projektdatei speichern</translation> </message> <message> - <location filename="Project/Project.py" line="3793"/> + <location filename="Project/Project.py" line="3798"/> <source>Code Coverage</source> <translation>Quelltext Abdeckung</translation> </message> <message> - <location filename="Project/Project.py" line="3793"/> + <location filename="Project/Project.py" line="3798"/> <source>Please select a coverage file</source> <translation>Bitte wählen sie eine Datei mit Abdeckungsdaten</translation> </message> <message> - <location filename="Project/Project.py" line="3839"/> + <location filename="Project/Project.py" line="3844"/> <source>Please select a profile file</source> <translation>Bitte wählen sie eine Datei mit Profildaten</translation> </message> <message> - <location filename="Project/Project.py" line="2943"/> + <location filename="Project/Project.py" line="2948"/> <source>Add directory to project</source> <translation>Verzeichnis zum Projekt hinzufügen</translation> </message> <message> - <location filename="Project/Project.py" line="2943"/> + <location filename="Project/Project.py" line="2948"/> <source>Add directory...</source> <translation>Verzeichnis hinzufügen...</translation> </message> <message> - <location filename="Project/Project.py" line="2947"/> + <location filename="Project/Project.py" line="2952"/> <source>Add a directory to the current project</source> <translation>Füge den Inhalt eines Verzeichnisses zum Projekt hinzu</translation> </message> <message> - <location filename="Project/Project.py" line="2949"/> + <location filename="Project/Project.py" line="2954"/> <source><b>Add directory...</b><p>This opens a dialog for adding a directory to the current project.</p></source> <translation><b>Verzeichnis hinzufügen</b><p>Dies öffnet einen Dialog, mit dem ein Verzeichnis bzw. der Inhalt eines Verzeichnisses zum aktuellen Projekt hinzugefügt werden kann.</p></translation> </message> @@ -27359,17 +27412,17 @@ <translation><p>Die Projekt Session Datei <b>{0}</b> konnte nicht gelöscht werden.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3129"/> + <location filename="Project/Project.py" line="3134"/> <source>Delete session</source> <translation>Session löschen</translation> </message> <message> - <location filename="Project/Project.py" line="3132"/> + <location filename="Project/Project.py" line="3137"/> <source>Delete the projects session file.</source> <translation>Löscht die Projekt Session Datei.</translation> </message> <message> - <location filename="Project/Project.py" line="3133"/> + <location filename="Project/Project.py" line="3138"/> <source><b>Delete session</b><p>This deletes the projects session file</p></source> <translation><b>Session löschen</b><p>Dies löscht die Session Datei des Projektes.</p></translation> </message> @@ -27379,7 +27432,7 @@ <translation>Ruby Dateien (*.rb);;</translation> </message> <message> - <location filename="Project/Project.py" line="2975"/> + <location filename="Project/Project.py" line="2980"/> <source><b>Search new files...</b><p>This searches for new files (sources, *.ui, *.idl) in the project directory and registered subdirectories.</p></source> <translation><b>Neue Dateien suchen...</b><p>Dies sucht im Projektverzeichnis und in registrierten Unterverzeichnissen nach neuen Dateien (Quellen, *.ui, *.idl).</p></translation> </message> @@ -27394,7 +27447,7 @@ <translation>Sonstige</translation> </message> <message> - <location filename="Project/Project.py" line="3892"/> + <location filename="Project/Project.py" line="3897"/> <source>Include module names?</source> <translation>Modulnamen anzeigen?</translation> </message> @@ -27459,152 +27512,152 @@ <translation><p>Die Datei mit den projektspezifischen Debugger Eigenschaften <b>{0}</b> konnte nicht gelöscht werden.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3037"/> + <location filename="Project/Project.py" line="3042"/> <source>Debugger Properties</source> <translation>Debugger Eigenschaften</translation> </message> <message> - <location filename="Project/Project.py" line="3037"/> + <location filename="Project/Project.py" line="3042"/> <source>Debugger &Properties...</source> <translation>Debugger &Eigenschaften...</translation> </message> <message> - <location filename="Project/Project.py" line="3040"/> + <location filename="Project/Project.py" line="3045"/> <source>Show the debugger properties</source> <translation>Debugger Eigenschaften anzeigen</translation> </message> <message> - <location filename="Project/Project.py" line="3041"/> + <location filename="Project/Project.py" line="3046"/> <source><b>Debugger Properties...</b><p>This shows a dialog to edit project specific debugger settings.</p></source> <translation><b>Debugger Eigenschaften...</b><p>Dies zeigt einen Dialog an, um die projektspezifischen Debugger Einstellungen zu bearbeiten.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3048"/> + <location filename="Project/Project.py" line="3053"/> <source>Load</source> <translation>Laden</translation> </message> <message> - <location filename="Project/Project.py" line="3048"/> + <location filename="Project/Project.py" line="3053"/> <source>&Load</source> <translation>&Laden</translation> </message> <message> - <location filename="Project/Project.py" line="3051"/> + <location filename="Project/Project.py" line="3056"/> <source>Load the debugger properties</source> <translation>Debugger Eigenschaften laden</translation> </message> <message> - <location filename="Project/Project.py" line="3059"/> + <location filename="Project/Project.py" line="3064"/> <source>Save</source> <translation>Speichern</translation> </message> <message> - <location filename="Project/Project.py" line="3062"/> + <location filename="Project/Project.py" line="3067"/> <source>Save the debugger properties</source> <translation>Debugger Eigenschaften speichern</translation> </message> <message> - <location filename="Project/Project.py" line="3070"/> + <location filename="Project/Project.py" line="3075"/> <source>Delete</source> <translation>Löschen</translation> </message> <message> - <location filename="Project/Project.py" line="3070"/> + <location filename="Project/Project.py" line="3075"/> <source>&Delete</source> <translation>&Löschen</translation> </message> <message> - <location filename="Project/Project.py" line="3073"/> + <location filename="Project/Project.py" line="3078"/> <source>Delete the debugger properties</source> <translation>Debugger Eigenschaften löschen</translation> </message> <message> - <location filename="Project/Project.py" line="3082"/> + <location filename="Project/Project.py" line="3087"/> <source>Reset</source> <translation>Zurücksetzen</translation> </message> <message> - <location filename="Project/Project.py" line="3082"/> + <location filename="Project/Project.py" line="3087"/> <source>&Reset</source> <translation>&Zurücksetzen</translation> </message> <message> - <location filename="Project/Project.py" line="3085"/> + <location filename="Project/Project.py" line="3090"/> <source>Reset the debugger properties</source> <translation>Debugger Eigenschaften zurücksetzen</translation> </message> <message> - <location filename="Project/Project.py" line="3268"/> + <location filename="Project/Project.py" line="3273"/> <source>Debugger</source> <translation>Debugger</translation> </message> <message> - <location filename="Project/Project.py" line="3265"/> + <location filename="Project/Project.py" line="3270"/> <source>Session</source> <translation>Session</translation> </message> <message> - <location filename="Project/Project.py" line="3052"/> + <location filename="Project/Project.py" line="3057"/> <source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source> <translation><b>Debugger Eigenschaften laden</b><p>Dies lädt die projektspezifischen Debugger Einstellungen.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3063"/> + <location filename="Project/Project.py" line="3068"/> <source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source> <translation><b>Debugger Eigenschaften speichern</b><p>Dies speichert die projektspezifischen Debugger Einstellungen.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3074"/> + <location filename="Project/Project.py" line="3079"/> <source><b>Delete Debugger Properties</b><p>This deletes the file containing the project specific debugger settings.</p></source> <translation><b>Debugger Eigenschaften löschen</b><p>Dies löscht die Datei mit den projektspezifischen Debugger Einstellungen.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3086"/> + <location filename="Project/Project.py" line="3091"/> <source><b>Reset Debugger Properties</b><p>This resets the project specific debugger settings.</p></source> <translation><b>Debugger Eigenschaften zurücksetzen</b><p>Dies setzt die projektspezifischen Debugger Einstellungen zurück.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3006"/> - <source>Filetype Associations</source> - <translation>Dateitypzuordnungen</translation> - </message> - <message> - <location filename="Project/Project.py" line="3006"/> - <source>Filetype Associations...</source> - <translation>Dateitypzuordnungen...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3009"/> - <source>Show the project filetype associations</source> - <translation>Zeigt die Dateitypzuordnungen des Projektes</translation> - </message> - <message> <location filename="Project/Project.py" line="3011"/> + <source>Filetype Associations</source> + <translation>Dateitypzuordnungen</translation> + </message> + <message> + <location filename="Project/Project.py" line="3011"/> + <source>Filetype Associations...</source> + <translation>Dateitypzuordnungen...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3014"/> + <source>Show the project filetype associations</source> + <translation>Zeigt die Dateitypzuordnungen des Projektes</translation> + </message> + <message> + <location filename="Project/Project.py" line="3016"/> <source><b>Filetype Associations...</b><p>This shows a dialog to edit the filetype associations of the project. These associations determine the type (source, form, interface or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.</p></source> <translation><b>Dateitypzuordnungen...</b><p>Dies zeigt einen Dialog zur Eingabe der Dateitypzuordnungen des Projektes. Diese Zuordnungen bestimmen den Typ (Quellen, Formulare, Schnittstellen oder Sonstige) über ein Dateinamenmuster. Sie werden genutzt, wenn eine Datei zum Projekt hinzugefügt oder wenn nach neuen Dateien gesucht wird.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3269"/> + <location filename="Project/Project.py" line="3274"/> <source>Pac&kagers</source> <translation>Pa&ketierer</translation> </message> <message> - <location filename="Project/Project.py" line="2929"/> - <source>Add files to project</source> - <translation>Dateien zum Projekt hinzufügen</translation> - </message> - <message> - <location filename="Project/Project.py" line="2929"/> - <source>Add &files...</source> - <translation>&Dateien hinzufügen...</translation> - </message> - <message> - <location filename="Project/Project.py" line="2933"/> - <source>Add files to the current project</source> - <translation>Fügt Dateien zum aktuellen Projekt hinzu</translation> - </message> - <message> <location filename="Project/Project.py" line="2934"/> + <source>Add files to project</source> + <translation>Dateien zum Projekt hinzufügen</translation> + </message> + <message> + <location filename="Project/Project.py" line="2934"/> + <source>Add &files...</source> + <translation>&Dateien hinzufügen...</translation> + </message> + <message> + <location filename="Project/Project.py" line="2938"/> + <source>Add files to the current project</source> + <translation>Fügt Dateien zum aktuellen Projekt hinzu</translation> + </message> + <message> + <location filename="Project/Project.py" line="2939"/> <source><b>Add files...</b><p>This opens a dialog for adding files to the current project. The place to add is determined by the file extension.</p></source> <translation><b>Dateien hinzufügen...</b><p>Dies öffnet einen Dialog, mit dem Dateien zum aktuellen Projekt hinzugefügt werden kann. Der Ort, an dem sie eingefügt werden, wird durch die Dateinamenerweiterung bestimmt.</p></translation> </message> @@ -27629,17 +27682,17 @@ <translation>Projektdateien (*.e4p)</translation> </message> <message> - <location filename="Project/Project.py" line="3256"/> + <location filename="Project/Project.py" line="3261"/> <source>&Project</source> <translation>&Projekt</translation> </message> <message> - <location filename="Project/Project.py" line="3371"/> + <location filename="Project/Project.py" line="3376"/> <source>Project</source> <translation>Projekt</translation> </message> <message> - <location filename="Project/Project.py" line="3432"/> + <location filename="Project/Project.py" line="3437"/> <source>&Clear</source> <translation>&Löschen</translation> </message> @@ -27669,22 +27722,22 @@ <translation><p>Die Datei mit den Nutzer bezogenen Projektdaten <b>{0}</b> konnte nicht geschrieben werden.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2994"/> + <location filename="Project/Project.py" line="2999"/> <source>User project properties</source> <translation>Nutzer bezogene Projektdaten</translation> </message> <message> - <location filename="Project/Project.py" line="2994"/> - <source>&User Properties...</source> - <translation>&Nutzer bezogene Projektdaten...</translation> - </message> - <message> - <location filename="Project/Project.py" line="2997"/> - <source>Show the user specific project properties</source> - <translation>Zeigt die Nutzer bezogenen Projektdaten an</translation> - </message> - <message> <location filename="Project/Project.py" line="2999"/> + <source>&User Properties...</source> + <translation>&Nutzer bezogene Projektdaten...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3002"/> + <source>Show the user specific project properties</source> + <translation>Zeigt die Nutzer bezogenen Projektdaten an</translation> + </message> + <message> + <location filename="Project/Project.py" line="3004"/> <source><b>User Properties...</b><p>This shows a dialog to edit the user specific project properties.</p></source> <translation><b>Nutzer bezogene Projektdaten...</b><p>Dies zeigt einen Dialog an, um Nutzer bezogene Projektdaten zu bearbeiten.</p></translation> </message> @@ -27702,47 +27755,47 @@ </translation> </message> <message> - <location filename="Project/Project.py" line="4023"/> + <location filename="Project/Project.py" line="4028"/> <source>Create Package List</source> <translation>Erzeuge Paketliste</translation> </message> <message> - <location filename="Project/Project.py" line="3193"/> + <location filename="Project/Project.py" line="3198"/> <source>Create &Package List</source> <translation>Erzeuge &Paketliste</translation> </message> <message> - <location filename="Project/Project.py" line="4183"/> + <location filename="Project/Project.py" line="4188"/> <source>Create Plugin Archive</source> <translation>Erzeuge Plugin Archiv</translation> </message> <message> - <location filename="Project/Project.py" line="3207"/> + <location filename="Project/Project.py" line="3212"/> <source>Create Plugin &Archive</source> <translation>Erzeuge Plugin &Archiv</translation> </message> <message> - <location filename="Project/Project.py" line="3996"/> + <location filename="Project/Project.py" line="4001"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation><p>Die Datei <b>PKGLIST</b> existiert bereits.</p><p>Überschreiben?</p></translation> </message> <message> - <location filename="Project/Project.py" line="4023"/> + <location filename="Project/Project.py" line="4028"/> <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> <translation><p>Die Datei <b>PKGLIST</b> konnte nicht erzeugt werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4040"/> + <location filename="Project/Project.py" line="4045"/> <source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source> <translation><p>Die Datei <b>PKGLIST</b> existiert nicht. Abbruch...</p></translation> </message> <message> - <location filename="Project/Project.py" line="4048"/> + <location filename="Project/Project.py" line="4053"/> <source>The project does not have a main script defined. Aborting...</source> <translation>Für das Projekt wurde kein Hauptskript angegeben. Abbruch...</translation> </message> <message> - <location filename="Project/Project.py" line="4060"/> + <location filename="Project/Project.py" line="4065"/> <source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source> <translation><p>Die Datei <b>PKGLIST</b> konnte nicht gelesen werden.</p><p>Ursache: {0}</p></translation> </message> @@ -27772,22 +27825,22 @@ <translation><p>Der Projekttyp <b>{0}</b> existiert bereits.</p></translation> </message> <message> - <location filename="Project/Project.py" line="4091"/> + <location filename="Project/Project.py" line="4096"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht im Archiv gespeichert werde. Sie wird ignoriert.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="3222"/> + <location filename="Project/Project.py" line="3227"/> <source>Create Plugin Archive (Snapshot)</source> <translation>Erzeuge Plugin Archiv (Snapshot)</translation> </message> <message> - <location filename="Project/Project.py" line="3222"/> + <location filename="Project/Project.py" line="3227"/> <source>Create Plugin Archive (&Snapshot)</source> <translation>Erzeuge Plugin Archiv (&Snapshot)</translation> </message> <message> - <location filename="Project/Project.py" line="4183"/> + <location filename="Project/Project.py" line="4188"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation><p>Die Plugindatei <b>{0}</b> konnte nicht gelesen werden.<br>Grund: {1}</p></translation> </message> @@ -27807,32 +27860,32 @@ <translation>Gib das Pfadmuster für Übersetzungsdateien ein (benutze '%language%' anstelle des Sprachcodes):</translation> </message> <message> - <location filename="Project/Project.py" line="3671"/> + <location filename="Project/Project.py" line="3676"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Reverting override.</p><p>{1}</p></source> <translation><p>Das ausgewählte Versionskontrollsystem <b>{0}</b> konnte nicht gefunden werden.<br/>Ignoriere Übersteuerung.</p><p>{1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="3680"/> + <location filename="Project/Project.py" line="3685"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Disabling version control.</p><p>{1}</p></source> <translation><p>Das ausgewählte Versionskontrollsystem <b>{0}</b> konnte nicht gefunden werden.<br/>Versionskontrolle nicht möglich.</p><p>{1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="3021"/> - <source>Lexer Associations</source> - <translation>Lexer Zuordnungen</translation> - </message> - <message> - <location filename="Project/Project.py" line="3021"/> - <source>Lexer Associations...</source> - <translation>Lexer Zuordnungen...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3024"/> - <source>Show the project lexer associations (overriding defaults)</source> - <translation>Zeigt die Projekt spezifischen Lexer Zuordnungen</translation> - </message> - <message> <location filename="Project/Project.py" line="3026"/> + <source>Lexer Associations</source> + <translation>Lexer Zuordnungen</translation> + </message> + <message> + <location filename="Project/Project.py" line="3026"/> + <source>Lexer Associations...</source> + <translation>Lexer Zuordnungen...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3029"/> + <source>Show the project lexer associations (overriding defaults)</source> + <translation>Zeigt die Projekt spezifischen Lexer Zuordnungen</translation> + </message> + <message> + <location filename="Project/Project.py" line="3031"/> <source><b>Lexer Associations...</b><p>This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.</p></source> <translation><b>Lexer Zuordnungen</b><p>Dies öffnet einen Dialog, um die Projekt spezifischen Lexer Zuordnungen zu bearbeiten. Diese Zuordnungen überschreiben die globalen Lexer Zuordnungen. Lexer werden verwendet, um den Editortext einzufärben.</p></translation> </message> @@ -27857,42 +27910,42 @@ <translation>Eric Plugin</translation> </message> <message> - <location filename="Project/Project.py" line="3197"/> + <location filename="Project/Project.py" line="3202"/> <source>Create an initial PKGLIST file for an eric5 plugin.</source> <translation>Erzeugt eine erste PKGLIST Datei für ein eric5 Plugin.</translation> </message> <message> - <location filename="Project/Project.py" line="3199"/> + <location filename="Project/Project.py" line="3204"/> <source><b>Create Package List</b><p>This creates an initial list of files to include in an eric5 plugin archive. The list is created from the project file.</p></source> <translation><b>Erzeuge Paketliste</b><p>Dies erzeugt eine erste List von Dateien, die in ein eric5 Pluginarchive einbezogen werden sollen. Die Liste wird aus der Projektdatei erzeugt.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3211"/> + <location filename="Project/Project.py" line="3216"/> <source>Create an eric5 plugin archive file.</source> <translation>Erzeugt eine eric5 Plugin Archivdatei.</translation> </message> <message> - <location filename="Project/Project.py" line="3213"/> + <location filename="Project/Project.py" line="3218"/> <source><b>Create Plugin Archive</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name.</p></source> <translation><b>Erzeuge Plugin Archiv</b><p>Dies erzeugt eine eric5 Plugin Archivdatei mit den Dateien, die in der PKGLIST Datei angegeben wurden. Der Archivname wird aus dem Namen des Hauptskriptes generiert.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3226"/> + <location filename="Project/Project.py" line="3231"/> <source>Create an eric5 plugin archive file (snapshot release).</source> <translation>Erzeugt eine eric5 Plugin Archivdatei (Snapshot Release).</translation> </message> <message> - <location filename="Project/Project.py" line="3228"/> + <location filename="Project/Project.py" line="3233"/> <source><b>Create Plugin Archive (Snapshot)</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name. The version entry of the main script is modified to reflect a snapshot release.</p></source> <translation><b>Erzeuge Plugin Archiv (Snapshot)</b><p>Dies erzeugt eine eric5 Plugin Archivdatei mit den Dateien, die in der PKGLIST Datei angegeben wurden. Der Archivname wird aus dem Namen des Hauptskriptes generiert. Der Versionseintrag des Hauptskriptes wird verändert, um ein Snapshot Release anzuzeigen.</p></translation> </message> <message> - <location filename="Project/Project.py" line="4071"/> + <location filename="Project/Project.py" line="4076"/> <source><p>The eric5 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation><p>Die eric5 Plugin Archivdatei <b>{0}</b> konnte nicht erzeugt werden.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4103"/> + <location filename="Project/Project.py" line="4108"/> <source><p>The eric5 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation><p>Die eric5 Plugin Archivdatei <b>{0}</b> wurde erfolgreich erzeugt.</p></translation> </message> @@ -29573,22 +29626,22 @@ <context> <name>Purge</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="91"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="97"/> <source>Purge All Files</source> <translation>Alle Dateien löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="98"/> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation>Wollen sie wirklich alle Dateien, die nicht von Mercurial überwacht werden, inklusive ignorierter Dateien löschen?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="101"/> <source>Purge Files</source> <translation>Dateien löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="102"/> <source>Do really want to delete files not tracked by Mercurial?</source> <translation>Wollen sie wirklich alle Dateien, die nicht von Mercurial überwacht werden, löschen?</translation> </message> @@ -31655,177 +31708,177 @@ <context> <name>Queues</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="256"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="276"/> <source>New Patch</source> <translation>Neuer Patch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="325"/> <source>Update Current Patch</source> <translation>Aktuellen Patch aktualisieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="356"/> - <source>Pop Patches</source> - <translation>Pop Patches</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="360"/> - <source>Push Patches</source> - <translation>Push Patches</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="364"/> - <source>Go to Patch</source> - <translation>zu Patch wechseln</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> - <source>Select Patch</source> - <translation>Patch auswählen</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="376"/> + <source>Pop Patches</source> + <translation>Pop Patches</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="380"/> + <source>Push Patches</source> + <translation>Push Patches</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="384"/> + <source>Go to Patch</source> + <translation>zu Patch wechseln</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="515"/> + <source>Select Patch</source> + <translation>Patch auswählen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="396"/> <source>Select the target patch name:</source> <translation>Wählen den Namen des Zielpatches aus:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="515"/> <source>No patches to select from.</source> <translation>Keine Patches zum Auswählen vorhanden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="447"/> <source>Finish Applied Patches</source> <translation>Angewandte Patches abschließen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="459"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="479"/> <source>Rename Patch</source> <translation>Patch umbenennen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="501"/> <source>Select the patch to be deleted:</source> <translation>Wähle den zu löschenden Patch aus:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="490"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="510"/> <source>Delete Patch</source> <translation>Patch löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="535"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="555"/> <source>Fold Patches</source> <translation>Patches zusammenfügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="551"/> <source>No patches selected.</source> <translation>Keine Patches ausgewählt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="535"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="555"/> <source>No patches available to be folded.</source> <translation>Keine Patches zum Zusammenführen verfügbar.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="559"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="579"/> <source>List Guards</source> <translation>Guards anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="559"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="579"/> <source>No patches available to list guards for.</source> <translation>Keine Patches verfügbar, für die Guards angezeigt werden können.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="594"/> - <source>Define Guards</source> - <translation>Guards definieren</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> - <source>No patches available to define guards for.</source> - <translation>Keine Patches verfügbar, für die Guards definiert werden können.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> - <source>Drop All Guards</source> - <translation>Alle Guards löschen</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="614"/> + <source>Define Guards</source> + <translation>Guards definieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <source>No patches available to define guards for.</source> + <translation>Keine Patches verfügbar, für die Guards definiert werden können.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <source>Drop All Guards</source> + <translation>Alle Guards löschen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="634"/> <source>Select the patch to drop guards for (leave empty for the current patch):</source> <translation>Patch auswählen dessen Guards gelöscht werden sollen (für aktuellen Patch leer lassen):</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="693"/> <source>Set Active Guards</source> <translation>Aktive Guards setzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="693"/> <source>No guards available to select from.</source> <translation>Keine Guards zur Auswahl verfügbar.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="691"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="715"/> <source>Deactivate Guards</source> <translation>Guards deaktivieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="753"/> <source>Create New Queue</source> <translation>Neue Patchschlange anlegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="755"/> <source>Rename Active Queue</source> <translation>Aktive Patchschlange umbenennen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="757"/> - <source>Error while creating a new queue.</source> - <translation>Fehler beim Anlegen einer neuen Patchschlange.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/> - <source>Error while renaming the active queue.</source> - <translation>Fehler beim Umbenennen der aktiven Patchschlange.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="787"/> - <source>Purge Queue</source> - <translation>Patchschlange säubern</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="789"/> + <source>Error while creating a new queue.</source> + <translation>Fehler beim Anlegen einer neuen Patchschlange.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="792"/> + <source>Error while renaming the active queue.</source> + <translation>Fehler beim Umbenennen der aktiven Patchschlange.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="819"/> + <source>Purge Queue</source> + <translation>Patchschlange säubern</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="821"/> <source>Delete Queue</source> <translation>Patchschlange löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="823"/> <source>Activate Queue</source> <translation>Patchschlange aktivieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="820"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="860"/> <source>Error while purging the queue.</source> <translation>Fehler beim Säubern der Patchschlange.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="862"/> <source>Error while deleting the queue.</source> <translation>Fehler beim Löschen der Patchschlange.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="864"/> <source>Error while setting the active queue.</source> <translation>Fehler beim Setzen der aktiven Patchschlange.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="847"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="887"/> <source>Available Queues</source> <translation>Verfügbare Patchschlangen</translation> </message> @@ -48617,24 +48670,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1168"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Vorgänger #{0}</b></td><td></td></tr> <tr><td><b>Änderungssatz</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1668"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marken</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1676"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Zweige</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1116"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1184"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -48643,7 +48696,7 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1214"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -48660,24 +48713,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1566"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1662"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Spitze</b></td><td></td></tr> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Änderungssatz</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1680"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Vorgänger</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1683"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -48688,7 +48741,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation> </message>
--- a/i18n/eric5_en.ts Wed Aug 31 19:28:49 2011 +0200 +++ b/i18n/eric5_en.ts Wed Aug 31 19:35:11 2011 +0200 @@ -1355,62 +1355,62 @@ <context> <name>Bookmarks</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="129"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="147"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="147"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="159"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="187"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="220"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="304"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="304"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="316"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="337"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="337"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="334"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="349"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -15186,250 +15186,265 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="234"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> - <source>Creating Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> + <source>Creating Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="331"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="351"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="427"/> - <source>Commiting changes to Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="475"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="523"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="558"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="622"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="686"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="746"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="791"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="776"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="869"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1047"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1224"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1298"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> <source>Select number of entries to show.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1477"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1509"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1599"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1656"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1679"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1736"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1856"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2024"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2098"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2006"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2108"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> - <source>Mercurial Bisect ({0})</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> - <source>Removing files from the Mercurial repository only</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> - <source>Backing out changeset</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <source>Mercurial Bisect ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2225"/> + <source>Removing files from the Mercurial repository only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2281"/> + <source>Backing out changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2306"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="454"/> + <source>Committing changes to Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <source>Mercurial Command Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2344"/> + <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -15509,12 +15524,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="110"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="110"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -15887,17 +15902,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> <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/BookmarksExtension/HgBookmarksInOutDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="165"/> <source>no bookmarks found</source> <translation type="unfinished"></translation> </message> @@ -15987,17 +16002,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> <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/BookmarksExtension/HgBookmarksListDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="150"/> <source>no bookmarks defined</source> <translation type="unfinished"></translation> </message> @@ -16116,6 +16131,44 @@ </message> </context> <context> + <name>HgClient</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="76"/> + <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/HgClient.py" line="117"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="119"/> + <source>Received data on unexpected channel.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="124"/> + <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="128"/> + <source>'capabilities' message did not contain any capability.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="136"/> + <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <source>'encoding' message did not contain any encoding.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/> @@ -16325,12 +16378,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -16398,42 +16451,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/> <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/HgDiffDialog.py" line="178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="206"/> <source>There is no difference.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="347"/> <source>Save Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="316"/> <source>Patch Files (*.diff)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="289"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="333"/> <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/HgDiffDialog.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="347"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="109"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="112"/> <source>Patch Contents</source> <translation type="unfinished"></translation> </message> @@ -16632,7 +16685,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="310"/> <source>Revision</source> <translation type="unfinished"></translation> </message> @@ -16707,17 +16760,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> <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/GpgExtension/HgGpgSignaturesDialog.py" line="128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="147"/> <source>no signatures found</source> <translation type="unfinished"></translation> </message> @@ -16765,17 +16818,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1082"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1079"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1128"/> <source>Author</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> <source>Message</source> <translation type="unfinished"></translation> </message> @@ -16925,47 +16978,47 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> <source>Added</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="116"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> <source>Modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/> <source>All</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="492"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="476"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -16980,7 +17033,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> <source>Bookmarks</source> <translation type="unfinished"></translation> </message> @@ -17063,106 +17116,106 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="55"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="56"/> <source><b>Processing your request, please wait...</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="66"/> <source>Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> <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/HgLogDialog.py" line="201"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="226"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="228"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="231"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="259"/> <source>No log available for '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="258"/> - <source>diff to {0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> - <source>Branches: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="268"/> - <source>Tags: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/> - <source>Parents: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="275"/> - <source><i>Author: {0}</i><br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="278"/> - <source><i>Date: {0}, {1}</i><br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="288"/> - <source>Added {0} (copied from {1})<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> + <source>diff to {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> + <source>Branches: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="302"/> + <source>Tags: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/> + <source>Parents: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> + <source><i>Author: {0}</i><br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <source><i>Date: {0}, {1}</i><br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> + <source>Added {0} (copied from {1})<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> <source>Added {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> <source>Modified {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="338"/> <source>Deleted {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="271"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> @@ -18606,37 +18659,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> <source>Unsaved Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> <source>Remove Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> <source>Do you really want to remove the selected guards?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> <source>Apply Guard Definitions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/> <source>The Mercurial process did not finish in time.</source> <translation type="unfinished"></translation> </message> @@ -18710,17 +18763,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> <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/QueuesExtension/HgQueuesHeaderDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="189"/> <source>Error: </source> <translation type="unfinished"></translation> </message> @@ -18738,12 +18791,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="89"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="103"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="94"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> @@ -18828,42 +18881,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> <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/QueuesExtension/HgQueuesListDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="219"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="50"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> <source>applied</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="53"/> + <source>guarded</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="54"/> + <source>missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="292"/> + <source>unknown</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> - <source>guarded</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="53"/> - <source>missing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="249"/> - <source>unknown</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> <source>not applied</source> <translation type="unfinished"></translation> </message> @@ -18901,7 +18954,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="111"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="122"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> @@ -19017,12 +19070,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="60"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="62"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="62"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="64"/> <source>Press to refresh the queues list</source> <translation type="unfinished"></translation> </message> @@ -19530,7 +19583,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="188"/> <source>Mercurial Status</source> <translation type="unfinished"></translation> </message> @@ -19606,107 +19659,107 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="62"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="63"/> <source>Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/> <source>Add to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="69"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="70"/> <source>Remove from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="71"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="72"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="76"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="77"/> <source>Adjust column sizes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> - <source>added</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> - <source>modified</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> - <source>removed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> - <source>not tracked</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> - <source>missing</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> - <source>normal</source> + <source>added</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> + <source>modified</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> + <source>removed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> + <source>not tracked</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <source>missing</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> + <source>normal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> <source>ignored</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="238"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="238"/> <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/HgStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="540"/> <source>Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="642"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="567"/> <source>Add</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="567"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="588"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="625"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="625"/> <source>Revert</source> <translation type="unfinished"></translation> </message> @@ -19781,27 +19834,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="68"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="74"/> <source>Restore missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="452"/> <source>all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="642"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="540"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> @@ -19809,12 +19862,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="153"/> <source>Mercurial status checked successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="119"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="100"/> <source>Could not start the Mercurial process.</source> <translation type="unfinished"></translation> </message> @@ -19904,32 +19957,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="86"/> <source>Mercurial Branches List</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="87"/> <source>Status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> <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/HgTagBranchListDialog.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="247"/> <source>active</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="252"/> <source>yes</source> <translation type="unfinished"></translation> </message> @@ -27013,7 +27066,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2869"/> + <location filename="Project/Project.py" line="2874"/> <source>New project</source> <translation type="unfinished"></translation> </message> @@ -27043,7 +27096,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2882"/> + <location filename="Project/Project.py" line="2887"/> <source>Open project</source> <translation type="unfinished"></translation> </message> @@ -27053,7 +27106,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2916"/> + <location filename="Project/Project.py" line="2921"/> <source>Save project as</source> <translation type="unfinished"></translation> </message> @@ -27086,687 +27139,687 @@ </translation> </message> <message> - <location filename="Project/Project.py" line="2869"/> + <location filename="Project/Project.py" line="2874"/> <source>&New...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2873"/> + <location filename="Project/Project.py" line="2878"/> <source>Generate a new project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2874"/> + <location filename="Project/Project.py" line="2879"/> <source><b>New...</b><p>This opens a dialog for entering the info for a new project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2882"/> - <source>&Open...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Project/Project.py" line="2886"/> - <source>Open an existing project</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Project/Project.py" line="2887"/> + <source>&Open...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="2891"/> + <source>Open an existing project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="2892"/> <source><b>Open...</b><p>This opens an existing project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2894"/> + <location filename="Project/Project.py" line="2899"/> <source>Close project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2894"/> + <location filename="Project/Project.py" line="2899"/> <source>&Close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2897"/> + <location filename="Project/Project.py" line="2902"/> <source>Close the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2898"/> + <location filename="Project/Project.py" line="2903"/> <source><b>Close</b><p>This closes the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2905"/> + <location filename="Project/Project.py" line="2910"/> <source>Save project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3059"/> + <location filename="Project/Project.py" line="3064"/> <source>&Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2908"/> + <location filename="Project/Project.py" line="2913"/> <source>Save the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2909"/> + <location filename="Project/Project.py" line="2914"/> <source><b>Save</b><p>This saves the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2916"/> + <location filename="Project/Project.py" line="2921"/> <source>Save &as...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2919"/> + <location filename="Project/Project.py" line="2924"/> <source>Save the current project to a new file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2920"/> + <location filename="Project/Project.py" line="2925"/> <source><b>Save as</b><p>This saves the current project to a new file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2929"/> + <location filename="Project/Project.py" line="2934"/> <source>Add files to project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2929"/> - <source>Add &files...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Project/Project.py" line="2933"/> - <source>Add files to the current project</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Project/Project.py" line="2934"/> + <source>Add &files...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="2938"/> + <source>Add files to the current project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="2939"/> <source><b>Add files...</b><p>This opens a dialog for adding files to the current project. The place to add is determined by the file extension.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2943"/> + <location filename="Project/Project.py" line="2948"/> <source>Add directory to project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2943"/> + <location filename="Project/Project.py" line="2948"/> <source>Add directory...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2947"/> + <location filename="Project/Project.py" line="2952"/> <source>Add a directory to the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2949"/> + <location filename="Project/Project.py" line="2954"/> <source><b>Add directory...</b><p>This opens a dialog for adding a directory to the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2957"/> + <location filename="Project/Project.py" line="2962"/> <source>Add translation to project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2957"/> + <location filename="Project/Project.py" line="2962"/> <source>Add &translation...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2961"/> + <location filename="Project/Project.py" line="2966"/> <source>Add a translation to the current project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2963"/> + <location filename="Project/Project.py" line="2968"/> <source><b>Add translation...</b><p>This opens a dialog for add a translation to the current project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2971"/> + <location filename="Project/Project.py" line="2976"/> <source>Search new files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2971"/> + <location filename="Project/Project.py" line="2976"/> <source>Searc&h new files...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2974"/> + <location filename="Project/Project.py" line="2979"/> <source>Search new files in the project directory.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2975"/> + <location filename="Project/Project.py" line="2980"/> <source><b>Search new files...</b><p>This searches for new files (sources, *.ui, *.idl) in the project directory and registered subdirectories.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2983"/> + <location filename="Project/Project.py" line="2988"/> <source>Project properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2983"/> + <location filename="Project/Project.py" line="2988"/> <source>&Properties...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2986"/> + <location filename="Project/Project.py" line="2991"/> <source>Show the project properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2987"/> + <location filename="Project/Project.py" line="2992"/> <source><b>Properties...</b><p>This shows a dialog to edit the project properties.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2994"/> - <source>User project properties</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Project/Project.py" line="2994"/> - <source>&User Properties...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Project/Project.py" line="2997"/> - <source>Show the user specific project properties</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Project/Project.py" line="2999"/> + <source>User project properties</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="2999"/> + <source>&User Properties...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3002"/> + <source>Show the user specific project properties</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3004"/> <source><b>User Properties...</b><p>This shows a dialog to edit the user specific project properties.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3006"/> - <source>Filetype Associations</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Project/Project.py" line="3006"/> - <source>Filetype Associations...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Project/Project.py" line="3009"/> - <source>Show the project filetype associations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Project/Project.py" line="3011"/> + <source>Filetype Associations</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3011"/> + <source>Filetype Associations...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3014"/> + <source>Show the project filetype associations</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3016"/> <source><b>Filetype Associations...</b><p>This shows a dialog to edit the filetype associations of the project. These associations determine the type (source, form, interface or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3021"/> + <location filename="Project/Project.py" line="3026"/> <source>Lexer Associations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3021"/> - <source>Lexer Associations...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Project/Project.py" line="3024"/> - <source>Show the project lexer associations (overriding defaults)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Project/Project.py" line="3026"/> + <source>Lexer Associations...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3029"/> + <source>Show the project lexer associations (overriding defaults)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3031"/> <source><b>Lexer Associations...</b><p>This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3037"/> + <location filename="Project/Project.py" line="3042"/> <source>Debugger Properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3037"/> + <location filename="Project/Project.py" line="3042"/> <source>Debugger &Properties...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3040"/> + <location filename="Project/Project.py" line="3045"/> <source>Show the debugger properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3041"/> + <location filename="Project/Project.py" line="3046"/> <source><b>Debugger Properties...</b><p>This shows a dialog to edit project specific debugger settings.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3048"/> + <location filename="Project/Project.py" line="3053"/> <source>Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3048"/> + <location filename="Project/Project.py" line="3053"/> <source>&Load</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3051"/> + <location filename="Project/Project.py" line="3056"/> <source>Load the debugger properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3052"/> + <location filename="Project/Project.py" line="3057"/> <source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3059"/> + <location filename="Project/Project.py" line="3064"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3062"/> + <location filename="Project/Project.py" line="3067"/> <source>Save the debugger properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3063"/> + <location filename="Project/Project.py" line="3068"/> <source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3070"/> + <location filename="Project/Project.py" line="3075"/> <source>Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3070"/> + <location filename="Project/Project.py" line="3075"/> <source>&Delete</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3073"/> + <location filename="Project/Project.py" line="3078"/> <source>Delete the debugger properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3074"/> + <location filename="Project/Project.py" line="3079"/> <source><b>Delete Debugger Properties</b><p>This deletes the file containing the project specific debugger settings.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3082"/> + <location filename="Project/Project.py" line="3087"/> <source>Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3082"/> + <location filename="Project/Project.py" line="3087"/> <source>&Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3085"/> + <location filename="Project/Project.py" line="3090"/> <source>Reset the debugger properties</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3086"/> + <location filename="Project/Project.py" line="3091"/> <source><b>Reset Debugger Properties</b><p>This resets the project specific debugger settings.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3095"/> + <location filename="Project/Project.py" line="3100"/> <source>Load session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3098"/> + <location filename="Project/Project.py" line="3103"/> <source>Load the projects session file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3099"/> + <location filename="Project/Project.py" line="3104"/> <source><b>Load session</b><p>This loads the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3112"/> + <location filename="Project/Project.py" line="3117"/> <source>Save session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3115"/> + <location filename="Project/Project.py" line="3120"/> <source>Save the projects session file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3116"/> + <location filename="Project/Project.py" line="3121"/> <source><b>Save session</b><p>This saves the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3129"/> + <location filename="Project/Project.py" line="3134"/> <source>Delete session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3132"/> + <location filename="Project/Project.py" line="3137"/> <source>Delete the projects session file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3133"/> + <location filename="Project/Project.py" line="3138"/> <source><b>Delete session</b><p>This deletes the projects session file</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3142"/> - <source>Code Metrics</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Project/Project.py" line="3142"/> - <source>&Code Metrics...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Project/Project.py" line="3145"/> - <source>Show some code metrics for the project.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Project/Project.py" line="3147"/> + <source>Code Metrics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3147"/> + <source>&Code Metrics...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3150"/> + <source>Show some code metrics for the project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3152"/> <source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3154"/> + <location filename="Project/Project.py" line="3159"/> <source>Python Code Coverage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3154"/> - <source>Code Co&verage...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Project/Project.py" line="3157"/> - <source>Show code coverage information for the project.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Project/Project.py" line="3159"/> + <source>Code Co&verage...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3162"/> + <source>Show code coverage information for the project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3164"/> <source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3839"/> + <location filename="Project/Project.py" line="3844"/> <source>Profile Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3167"/> - <source>&Profile Data...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Project/Project.py" line="3170"/> - <source>Show profiling data for the project.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Project/Project.py" line="3172"/> + <source>&Profile Data...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3175"/> + <source>Show profiling data for the project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3177"/> <source><b>Profile Data...</b><p>This shows the profiling data for the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3892"/> + <location filename="Project/Project.py" line="3897"/> <source>Application Diagram</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3179"/> - <source>&Application Diagram...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Project/Project.py" line="3182"/> - <source>Show a diagram of the project.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Project/Project.py" line="3184"/> + <source>&Application Diagram...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3187"/> + <source>Show a diagram of the project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3189"/> <source><b>Application Diagram...</b><p>This shows a diagram of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4023"/> + <location filename="Project/Project.py" line="4028"/> <source>Create Package List</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3193"/> + <location filename="Project/Project.py" line="3198"/> <source>Create &Package List</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3197"/> + <location filename="Project/Project.py" line="3202"/> <source>Create an initial PKGLIST file for an eric5 plugin.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3199"/> + <location filename="Project/Project.py" line="3204"/> <source><b>Create Package List</b><p>This creates an initial list of files to include in an eric5 plugin archive. The list is created from the project file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4183"/> + <location filename="Project/Project.py" line="4188"/> <source>Create Plugin Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3207"/> + <location filename="Project/Project.py" line="3212"/> <source>Create Plugin &Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3211"/> + <location filename="Project/Project.py" line="3216"/> <source>Create an eric5 plugin archive file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3213"/> + <location filename="Project/Project.py" line="3218"/> <source><b>Create Plugin Archive</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3222"/> + <location filename="Project/Project.py" line="3227"/> <source>Create Plugin Archive (Snapshot)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3222"/> + <location filename="Project/Project.py" line="3227"/> <source>Create Plugin Archive (&Snapshot)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3226"/> + <location filename="Project/Project.py" line="3231"/> <source>Create an eric5 plugin archive file (snapshot release).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3228"/> + <location filename="Project/Project.py" line="3233"/> <source><b>Create Plugin Archive (Snapshot)</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name. The version entry of the main script is modified to reflect a snapshot release.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3256"/> - <source>&Project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Project/Project.py" line="3257"/> - <source>Open &Recent Projects</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Project/Project.py" line="3258"/> - <source>&Version Control</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Project/Project.py" line="3261"/> - <source>Chec&k</source> + <source>&Project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3262"/> + <source>Open &Recent Projects</source> <translation type="unfinished"></translation> </message> <message> <location filename="Project/Project.py" line="3263"/> - <source>Sho&w</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Project/Project.py" line="3264"/> - <source>&Diagrams</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Project/Project.py" line="3265"/> - <source>Session</source> + <source>&Version Control</source> <translation type="unfinished"></translation> </message> <message> <location filename="Project/Project.py" line="3266"/> - <source>Source &Documentation</source> + <source>Chec&k</source> <translation type="unfinished"></translation> </message> <message> <location filename="Project/Project.py" line="3268"/> - <source>Debugger</source> + <source>Sho&w</source> <translation type="unfinished"></translation> </message> <message> <location filename="Project/Project.py" line="3269"/> + <source>&Diagrams</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3270"/> + <source>Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3271"/> + <source>Source &Documentation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3273"/> + <source>Debugger</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3274"/> <source>Pac&kagers</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3371"/> + <location filename="Project/Project.py" line="3376"/> <source>Project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3432"/> + <location filename="Project/Project.py" line="3437"/> <source>&Clear</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3542"/> + <location filename="Project/Project.py" line="3547"/> <source>Search New Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3542"/> + <location filename="Project/Project.py" line="3547"/> <source>There were no new files found to be added.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3680"/> + <location filename="Project/Project.py" line="3685"/> <source>Version Control System</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3671"/> + <location filename="Project/Project.py" line="3676"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Reverting override.</p><p>{1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3680"/> + <location filename="Project/Project.py" line="3685"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Disabling version control.</p><p>{1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3772"/> + <location filename="Project/Project.py" line="3777"/> <source>Coverage Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3818"/> + <location filename="Project/Project.py" line="3823"/> <source>There is no main script defined for the current project. Aborting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3793"/> + <location filename="Project/Project.py" line="3798"/> <source>Code Coverage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3793"/> + <location filename="Project/Project.py" line="3798"/> <source>Please select a coverage file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3839"/> + <location filename="Project/Project.py" line="3844"/> <source>Please select a profile file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3892"/> + <location filename="Project/Project.py" line="3897"/> <source>Include module names?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3996"/> + <location filename="Project/Project.py" line="4001"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4023"/> + <location filename="Project/Project.py" line="4028"/> <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4040"/> + <location filename="Project/Project.py" line="4045"/> <source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4048"/> + <location filename="Project/Project.py" line="4053"/> <source>The project does not have a main script defined. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4060"/> + <location filename="Project/Project.py" line="4065"/> <source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4071"/> + <location filename="Project/Project.py" line="4076"/> <source><p>The eric5 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4091"/> + <location filename="Project/Project.py" line="4096"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4103"/> + <location filename="Project/Project.py" line="4108"/> <source><p>The eric5 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4183"/> + <location filename="Project/Project.py" line="4188"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -29424,22 +29477,22 @@ <context> <name>Purge</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="91"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="97"/> <source>Purge All Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="98"/> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="101"/> <source>Purge Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="102"/> <source>Do really want to delete files not tracked by Mercurial?</source> <translation type="unfinished"></translation> </message> @@ -31401,177 +31454,177 @@ <context> <name>Queues</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="256"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="276"/> <source>New Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="325"/> <source>Update Current Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="356"/> - <source>Pop Patches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="360"/> - <source>Push Patches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="364"/> - <source>Go to Patch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> - <source>Select Patch</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="376"/> + <source>Pop Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="380"/> + <source>Push Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="384"/> + <source>Go to Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="515"/> + <source>Select Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="396"/> <source>Select the target patch name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="515"/> <source>No patches to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="447"/> <source>Finish Applied Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="459"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="479"/> <source>Rename Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="501"/> <source>Select the patch to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="490"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="510"/> <source>Delete Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="535"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="555"/> <source>Fold Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="551"/> <source>No patches selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="535"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="555"/> <source>No patches available to be folded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="559"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="579"/> <source>List Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="559"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="579"/> <source>No patches available to list guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="594"/> - <source>Define Guards</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> - <source>No patches available to define guards for.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> - <source>Drop All Guards</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="614"/> + <source>Define Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <source>No patches available to define guards for.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <source>Drop All Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="634"/> <source>Select the patch to drop guards for (leave empty for the current patch):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="693"/> <source>Set Active Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="693"/> <source>No guards available to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="691"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="715"/> <source>Deactivate Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="753"/> <source>Create New Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="755"/> <source>Rename Active Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="757"/> - <source>Error while creating a new queue.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/> - <source>Error while renaming the active queue.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="787"/> - <source>Purge Queue</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="789"/> + <source>Error while creating a new queue.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="792"/> + <source>Error while renaming the active queue.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="819"/> + <source>Purge Queue</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="821"/> <source>Delete Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="823"/> <source>Activate Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="820"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="860"/> <source>Error while purging the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="862"/> <source>Error while deleting the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="864"/> <source>Error while setting the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="847"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="887"/> <source>Available Queues</source> <translation type="unfinished"></translation> </message> @@ -48184,30 +48237,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1168"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1668"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1676"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1116"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1184"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1214"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -48218,23 +48271,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1566"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1662"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1680"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1683"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -48242,7 +48295,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Wed Aug 31 19:28:49 2011 +0200 +++ b/i18n/eric5_es.ts Wed Aug 31 19:35:11 2011 +0200 @@ -1378,62 +1378,62 @@ <context> <name>Bookmarks</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="129"/> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="147"/> <source>Delete Bookmark</source> <translation>Borrar Marcador</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="147"/> <source>Select the bookmark to be deleted:</source> <translation>Seleccionar el marcador a borrar:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="159"/> <source>Delete Mercurial Bookmark</source> <translation>Borrar Marcador de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="187"/> <source>Rename Mercurial Bookmark</source> <translation>Renombrar Marcador de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="220"/> <source>Move Mercurial Bookmark</source> <translation>Mover Marcador de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="304"/> <source>Pull Bookmark</source> <translation>Pull de Marcador</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="304"/> <source>Select the bookmark to be pulled:</source> <translation>Seleccinar el marcador sobre el que hacer pull:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="316"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Haciendo pull de marcador desde un repositorio Mercurial remoto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="337"/> <source>Push Bookmark</source> <translation>Push de Marcador</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="337"/> <source>Select the bookmark to be push:</source> <translation>Seleccinar el marcador sobre el que hacer push:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="334"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="349"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Haciendo push de marcador desde un repositorio Mercurial remoto</translation> </message> @@ -15441,250 +15441,270 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> <source>The hg process finished with the exit code {0}</source> <translation>El proceso hg ha terminado con código de salida {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="234"/> <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/hg.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <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/hg.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> <source>Create project repository</source> <translation>Crear repositorio del proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> <source>The project repository could not be created.</source> <translation>No se ha podido crear el repositorio del proyecto.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> - <source>Creating Mercurial repository</source> - <translation>Creando repositorio Mercurial</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> + <source>Creating Mercurial repository</source> + <translation>Creando repositorio Mercurial</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> <source>Initial commit to Mercurial repository</source> <translation>Commit inicial al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="331"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="351"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonando proyecto desde un repositorio Mercurial</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="427"/> <source>Commiting changes to Mercurial repository</source> - <translation>Haciendo commit de cambios al repositorio Mercurial</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="475"/> + <translation type="obsolete">Haciendo commit de cambios al repositorio Mercurial</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizando con el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="523"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="558"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Añadiendo archivos/directorios al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="622"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Eliminando archivos/directorios del repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="686"/> <source>Renaming {0}</source> <translation>Renombrando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="869"/> <source>Merging</source> <translation>Haciendo un merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1224"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1298"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> <source>Mercurial Log</source> <translation>Registro de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> <source>Select number of entries to show.</source> <translation>Seleccionar número de entradas a mostrar.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1477"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> <source>Pulling from a remote Mercurial repository</source> <translation>Haciendo pull de un repositorio remoto Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1509"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1599"/> <source>Pushing to a remote Mercurial repository</source> <translation>Haciendo push a un repositorio remoto Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source>Resolving files/directories</source> <translation>Resolviendo archivos/directorios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="746"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="791"/> <source>Taging in the Mercurial repository</source> <translation>Haciendo tag en el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="776"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1047"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source>Create Branch</source> <translation>Crear Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source>Enter branch name</source> <translation>Introducir nombre de branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1656"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> <source>Creating branch in the Mercurial repository</source> <translation>Creando branch en el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1736"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verificando la integridad del repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1856"/> <source>Showing the combined configuration settings</source> <translation>Mostrando los ajustes de configuración combinados</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> <source>Shall the working directory be updated?</source> <translation>¿Debe ser actualizado el directorio de trabajo?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1679"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation>Subcomando bisect ({0}) inválido.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> - <source>Mercurial Bisect ({0})</source> - <translation>Mercurial Bisect ({0})</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> - <source>Preview changegroup</source> - <translation>Previsualizar changegroup</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> - <source>Identifying project directory</source> - <translation>Identificando directorio de proyecto</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> - <source>Create .hgignore file</source> - <translation>Crear archivo .hgignore</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> - <source>Removing files from the Mercurial repository only</source> - <translation>Eliminando archivos unicamente del repositorio Mercurial</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation>Archivos Changegroup de Mercurial (*.hg)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> - <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> - <translation>Archivos Changegroup de Mercurial (*.hg);;Todos los Archivos (*)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2006"/> - <source>Identifying changegroup file</source> - <translation>Identificando archivo de changegroup</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> - <source>Backing out changeset</source> - <translation>Haciendo respaldo de changeset</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation>Subcomando bisect ({0}) inválido.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <source>Mercurial Bisect ({0})</source> + <translation>Mercurial Bisect ({0})</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2098"/> + <source>Preview changegroup</source> + <translation>Previsualizar changegroup</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <source>Identifying project directory</source> + <translation>Identificando directorio de proyecto</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <source>Create .hgignore file</source> + <translation>Crear archivo .hgignore</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2225"/> + <source>Removing files from the Mercurial repository only</source> + <translation>Eliminando archivos unicamente del repositorio Mercurial</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation>Archivos Changegroup de Mercurial (*.hg)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> + <translation>Archivos Changegroup de Mercurial (*.hg);;Todos los Archivos (*)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2108"/> + <source>Identifying changegroup file</source> + <translation>Identificando archivo de changegroup</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2281"/> + <source>Backing out changeset</source> + <translation>Haciendo respaldo de changeset</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> <source>No revision given. Aborting...</source> <translation>No se ha proporcionado revisión. Abortando...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2024"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo changegroup de Mercurial <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2306"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>¿Está seguro de que quiere aplicar un rollback a la última transacción?</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="454"/> + <source>Committing changes to Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <source>Mercurial Command Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2344"/> + <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -15764,12 +15784,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="110"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="110"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <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> @@ -16143,17 +16163,17 @@ <translation>Marcadores de Mercurial Salientes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="165"/> <source>no bookmarks found</source> <translation>no se han encontrado marcadores</translation> </message> @@ -16245,17 +16265,17 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="150"/> <source>no bookmarks defined</source> <translation>no se han definido marcadores</translation> </message> @@ -16374,6 +16394,44 @@ </message> </context> <context> + <name>HgClient</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="76"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished">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/HgClient.py" line="117"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="119"/> + <source>Received data on unexpected channel.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="124"/> + <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="128"/> + <source>'capabilities' message did not contain any capability.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="136"/> + <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <source>'encoding' message did not contain any encoding.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/> @@ -16591,12 +16649,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> <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> @@ -16664,42 +16722,42 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="206"/> <source>There is no difference.</source> <translation>No hay ninguna diferencia.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="347"/> <source>Save Diff</source> <translation>Guardar Diff</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="316"/> <source>Patch Files (*.diff)</source> <translation>Archivos de Parche (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="347"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>El archivo de parche <b>{0}</b> no puede ser guardado.<br />Causa: {1}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="289"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="333"/> <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/HgDiffDialog.py" line="109"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="112"/> <source>Patch Contents</source> <translation>Contenido del Patch</translation> </message> @@ -16898,7 +16956,7 @@ <translation>Seleccionar la categoría sobre la que filtrar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="310"/> <source>Revision</source> <translation>Revisión</translation> </message> @@ -16973,17 +17031,17 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="147"/> <source>no signatures found</source> <translation>no se han encontrado firmas</translation> </message> @@ -17021,17 +17079,17 @@ <translation>Seleccione el campo de filtrado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1082"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1079"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1128"/> <source>Author</source> <translation>Autor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> <source>Message</source> <translation>Mensaje</translation> </message> @@ -17146,27 +17204,27 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> <source>Added</source> <translation>Añadido</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="116"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Deleted</source> <translation>Borrado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> <source>Modified</source> <translation>Modificado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> <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> @@ -17181,17 +17239,17 @@ <translation>Tags</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489"/> <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="473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="492"/> <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="476"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> <source>Mercurial Error</source> <translation>Error de Mercurial</translation> </message> @@ -17231,7 +17289,7 @@ <translation>Seleccione la branch para filtrar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/> <source>All</source> <translation>Todo</translation> </message> @@ -17246,7 +17304,7 @@ <translation>Mercurial Log (Saliente)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> <source>Bookmarks</source> <translation>Marcadores</translation> </message> @@ -17329,115 +17387,115 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="55"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="56"/> <source><b>Processing your request, please wait...</b></source> <translation><b>Procesando la solicitud, por favor aguarde...</b></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="66"/> <source>Revision</source> <translation>Revisión</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="259"/> <source>No log available for '{0}'</source> <translation>No hay registros de log disponibles para '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> <source>diff to {0}</source> <translation>diff con {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> <source>Branches: {0}<br /> </source> <translation>Branches: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="302"/> <source>Tags: {0}<br /> </source> <translation>Tags: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/> <source>Parents: {0}<br /> </source> <translation>Parents: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Autor: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="278"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Fecha: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> <source>Added {0}<br /> </source> <translation>Añadido {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> <source>Modified {0}<br /> </source> <translation>Modificado {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="338"/> <source>Deleted {0}<br /> </source> <translation>Borrado {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="201"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="226"/> <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/HgLogDialog.py" line="203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="228"/> <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/HgLogDialog.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="231"/> <source>Mercurial Error</source> <translation>Error de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="288"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Añadido {0} (copiado de {1})<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="271"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> <source>Bookmarks: {0}<br /> </source> <translation>Marcadores: {0}<br /> @@ -18929,37 +18987,37 @@ <translation>Eliminar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> <source>Unsaved Changes</source> <translation>Cambios sin Guardar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation>La lista de guards ha cambiado. ¿Deben aplicarse los cambios?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> <source>Remove Guards</source> <translation>Eliminar Guards</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> <source>Do you really want to remove the selected guards?</source> <translation>¿Desea realmente eleminar los guards seleccionados?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> <source>Apply Guard Definitions</source> <translation>Aplicar Definiciones de Guards</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation><p>Los guards definidos no se han podido aplicar.</p><p>Causa: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/> <source>The Mercurial process did not finish in time.</source> <translation>El proceso de Mercurial no terminó en plazo.</translation> </message> @@ -19033,17 +19091,17 @@ <translation>Mensaje de Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="189"/> <source>Error: </source> <translation>Error:</translation> </message> @@ -19061,12 +19119,12 @@ <translation>Mostrar todos los guards de todos los patches</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="89"/> <source>Unguarded</source> <translation>Sin Guard</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="103"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="94"/> <source>no patches found</source> <translation>no se han encontrado patches</translation> </message> @@ -19153,42 +19211,42 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="219"/> <source>no patches found</source> <translation>no se han encontrado patches</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="50"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> <source>applied</source> <translation>aplicado</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="53"/> + <source>guarded</source> + <translation>con guard</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="54"/> + <source>missing</source> + <translation>perdido</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="292"/> + <source>unknown</source> + <translation>desconocido</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> - <source>guarded</source> - <translation>con guard</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="53"/> - <source>missing</source> - <translation>perdido</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="249"/> - <source>unknown</source> - <translation>desconocido</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> <source>not applied</source> <translation>sin aplicar</translation> </message> @@ -19226,7 +19284,7 @@ <translation>Muestra la lista de guards definidos para el patch seleccionado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="111"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="122"/> <source>Unguarded</source> <translation>Sin Guard</translation> </message> @@ -19347,12 +19405,12 @@ <translation>Muestra una lista de colas disponibles (cola activa en negrita)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="60"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="62"/> <source>Refresh</source> <translation>Actualizar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="62"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="64"/> <source>Press to refresh the queues list</source> <translation>Pulsar para actualizar el listado de colas</translation> </message> @@ -19860,7 +19918,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="188"/> <source>Mercurial Status</source> <translation>Mercurial Status</translation> </message> @@ -19937,107 +19995,107 @@ <translation>Presione para actualizar el estado visualizado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="62"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="63"/> <source>Commit changes to repository...</source> <translation>Hacer commit de los cambios al repositorio...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/> <source>Add to repository</source> <translation>Añadir al repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="71"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="72"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="76"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="77"/> <source>Adjust column sizes</source> <translation>Adjustar tamaño de columnas</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>added</source> <translation>añadido</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> - <source>modified</source> - <translation>modificado</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> - <source>removed</source> - <translation>eliminado</translation> + <source>modified</source> + <translation>modificado</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> - <source>not tracked</source> - <translation>sin seguimiento</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> - <source>normal</source> - <translation>normal</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> - <source>ignored</source> - <translation>ignorado</translation> + <source>removed</source> + <translation>eliminado</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> + <source>not tracked</source> + <translation>sin seguimiento</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> + <source>normal</source> + <translation>normal</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> + <source>ignored</source> + <translation>ignorado</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> <source>missing</source> <translation>perdido</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="238"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="238"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="540"/> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="642"/> <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="529"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="567"/> <source>Add</source> <translation>Añadir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="567"/> <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="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="625"/> <source>Revert</source> <translation>Revertir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="69"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="70"/> <source>Remove from repository</source> <translation>Eliminar de repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="588"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="625"/> <source>There are no missing entries available/selected.</source> <translation>No hay entradas perdidas disponibles/seleccionadas.</translation> </message> @@ -20112,17 +20170,17 @@ <translation>&Restore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="68"/> <source>Show differences</source> <translation>Mostrar diferencias</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="74"/> <source>Restore missing</source> <translation>Restore sobre elementos perdidos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="452"/> <source>all</source> <translation>todo</translation> </message> @@ -20132,12 +20190,12 @@ <translation type="obsolete">Diferencia</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="642"/> <source>Differences</source> <translation>Diferencias</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="540"/> <source>There are no entries selected to be committed.</source> <translation>No hay entradas seleccionadas sobre las que aplicar commit.</translation> </message> @@ -20145,12 +20203,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="153"/> <source>Mercurial status checked successfully</source> <translation>El estado de Mercurial se ha chequeado con éxito</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="119"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="100"/> <source>Could not start the Mercurial process.</source> <translation>No se pudo ejecutar el proceso Mercurial.</translation> </message> @@ -20242,32 +20300,32 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="86"/> <source>Mercurial Branches List</source> <translation>Lista de Branches de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="87"/> <source>Status</source> <translation>Estado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="247"/> <source>active</source> <translation>activo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="252"/> <source>yes</source> <translation>si</translation> </message> @@ -27268,7 +27326,7 @@ <translation>¿Le gustaría editar las opciones de comando para VCS?</translation> </message> <message> - <location filename="Project/Project.py" line="2869"/> + <location filename="Project/Project.py" line="2874"/> <source>New project</source> <translation>Proyecto nuevo</translation> </message> @@ -27288,7 +27346,7 @@ <translation>Seleccione el sistema de control de versiones para el proyecto</translation> </message> <message> - <location filename="Project/Project.py" line="2882"/> + <location filename="Project/Project.py" line="2887"/> <source>Open project</source> <translation>Abrir proyecto</translation> </message> @@ -27298,7 +27356,7 @@ <translation>Archivos de proyecto (*.e4p)</translation> </message> <message> - <location filename="Project/Project.py" line="2916"/> + <location filename="Project/Project.py" line="2921"/> <source>Save project as</source> <translation>Guardar proyecto como</translation> </message> @@ -27331,587 +27389,587 @@ </translation> </message> <message> - <location filename="Project/Project.py" line="2869"/> + <location filename="Project/Project.py" line="2874"/> <source>&New...</source> <translation>&Nuevo...</translation> </message> <message> - <location filename="Project/Project.py" line="2873"/> + <location filename="Project/Project.py" line="2878"/> <source>Generate a new project</source> <translation>Generar un nuevo proyecto</translation> </message> <message> - <location filename="Project/Project.py" line="2874"/> + <location filename="Project/Project.py" line="2879"/> <source><b>New...</b><p>This opens a dialog for entering the info for a new project.</p></source> <translation><b>Nuevo...</b><p>Abre un diálogo para introducir la información para un nuevo proyecto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2882"/> - <source>&Open...</source> - <translation>&Abrir...</translation> - </message> - <message> - <location filename="Project/Project.py" line="2886"/> - <source>Open an existing project</source> - <translation>Abrir un proyecto existente</translation> - </message> - <message> <location filename="Project/Project.py" line="2887"/> + <source>&Open...</source> + <translation>&Abrir...</translation> + </message> + <message> + <location filename="Project/Project.py" line="2891"/> + <source>Open an existing project</source> + <translation>Abrir un proyecto existente</translation> + </message> + <message> + <location filename="Project/Project.py" line="2892"/> <source><b>Open...</b><p>This opens an existing project.</p></source> <translation><b>Abrir...</b><p>Abre un proyecto existente..</p></translation> </message> <message> - <location filename="Project/Project.py" line="2894"/> + <location filename="Project/Project.py" line="2899"/> <source>Close project</source> <translation>Cerrar proyecto</translation> </message> <message> - <location filename="Project/Project.py" line="2894"/> + <location filename="Project/Project.py" line="2899"/> <source>&Close</source> <translation>&Cerrar</translation> </message> <message> - <location filename="Project/Project.py" line="2897"/> + <location filename="Project/Project.py" line="2902"/> <source>Close the current project</source> <translation>Cierra el proyecto actual</translation> </message> <message> - <location filename="Project/Project.py" line="2898"/> + <location filename="Project/Project.py" line="2903"/> <source><b>Close</b><p>This closes the current project.</p></source> <translation><b>Cerrar</b><p>Cierra el proyecto actualt.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2905"/> + <location filename="Project/Project.py" line="2910"/> <source>Save project</source> <translation>Guardar proyecto</translation> </message> <message> - <location filename="Project/Project.py" line="3059"/> + <location filename="Project/Project.py" line="3064"/> <source>&Save</source> <translation>&Guardar</translation> </message> <message> - <location filename="Project/Project.py" line="2908"/> + <location filename="Project/Project.py" line="2913"/> <source>Save the current project</source> <translation>Guarda el proyecto actual</translation> </message> <message> - <location filename="Project/Project.py" line="2909"/> + <location filename="Project/Project.py" line="2914"/> <source><b>Save</b><p>This saves the current project.</p></source> <translation><b>Guardar</b><p>Guarda el proyecto actual.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2916"/> + <location filename="Project/Project.py" line="2921"/> <source>Save &as...</source> <translation>Guardar co&mo...</translation> </message> <message> - <location filename="Project/Project.py" line="2919"/> + <location filename="Project/Project.py" line="2924"/> <source>Save the current project to a new file</source> <translation>Guardar el proyecto actual en un nuevo archivo</translation> </message> <message> - <location filename="Project/Project.py" line="2920"/> + <location filename="Project/Project.py" line="2925"/> <source><b>Save as</b><p>This saves the current project to a new file.</p></source> <translation><b>Guardar como</b><p>Guarda el proyecto en otro archivo.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2929"/> + <location filename="Project/Project.py" line="2934"/> <source>Add files to project</source> <translation>Agregar archivos al proyecto</translation> </message> <message> - <location filename="Project/Project.py" line="2929"/> - <source>Add &files...</source> - <translation>&Agregar archivos...</translation> - </message> - <message> - <location filename="Project/Project.py" line="2933"/> - <source>Add files to the current project</source> - <translation>Añadir archivos al proyecto actual</translation> - </message> - <message> <location filename="Project/Project.py" line="2934"/> + <source>Add &files...</source> + <translation>&Agregar archivos...</translation> + </message> + <message> + <location filename="Project/Project.py" line="2938"/> + <source>Add files to the current project</source> + <translation>Añadir archivos al proyecto actual</translation> + </message> + <message> + <location filename="Project/Project.py" line="2939"/> <source><b>Add files...</b><p>This opens a dialog for adding files to the current project. The place to add is determined by the file extension.</p></source> <translation><b>Añadir archivos...</b><p>Abre un diálogo para añadir archivos al proyecto actual. El lugar donde se van a añadir es determinado por la extensión del nombre de archivo.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2943"/> + <location filename="Project/Project.py" line="2948"/> <source>Add directory to project</source> <translation>Agregar directorio al proyecto</translation> </message> <message> - <location filename="Project/Project.py" line="2943"/> + <location filename="Project/Project.py" line="2948"/> <source>Add directory...</source> <translation>Agregar directorio...</translation> </message> <message> - <location filename="Project/Project.py" line="2947"/> + <location filename="Project/Project.py" line="2952"/> <source>Add a directory to the current project</source> <translation>Agregar directorio al proyecto actual</translation> </message> <message> - <location filename="Project/Project.py" line="2949"/> + <location filename="Project/Project.py" line="2954"/> <source><b>Add directory...</b><p>This opens a dialog for adding a directory to the current project.</p></source> <translation><b>Añadir directorio...</b><p>Abre un diálogo para añadir un directorio al proyecto actual.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2957"/> + <location filename="Project/Project.py" line="2962"/> <source>Add translation to project</source> <translation>Añadir traducción al proyecto</translation> </message> <message> - <location filename="Project/Project.py" line="2957"/> + <location filename="Project/Project.py" line="2962"/> <source>Add &translation...</source> <translation>Añadir &Traducción...</translation> </message> <message> - <location filename="Project/Project.py" line="2961"/> + <location filename="Project/Project.py" line="2966"/> <source>Add a translation to the current project</source> <translation>Añadir una traducción al proyecto actual</translation> </message> <message> - <location filename="Project/Project.py" line="2963"/> + <location filename="Project/Project.py" line="2968"/> <source><b>Add translation...</b><p>This opens a dialog for add a translation to the current project.</p></source> <translation><b>Añadir traducción...</b><p>Abre un diálogo para añadir una traducción al proyecto actual.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2971"/> + <location filename="Project/Project.py" line="2976"/> <source>Search new files</source> <translation>Buscar archivos nuevos</translation> </message> <message> - <location filename="Project/Project.py" line="2971"/> + <location filename="Project/Project.py" line="2976"/> <source>Searc&h new files...</source> <translation>Bus&car archivos nuevos...</translation> </message> <message> - <location filename="Project/Project.py" line="2974"/> + <location filename="Project/Project.py" line="2979"/> <source>Search new files in the project directory.</source> <translation>Bucar nuevos archivos en el directorio de proyecto.</translation> </message> <message> - <location filename="Project/Project.py" line="2975"/> + <location filename="Project/Project.py" line="2980"/> <source><b>Search new files...</b><p>This searches for new files (sources, *.ui, *.idl) in the project directory and registered subdirectories.</p></source> <translation><b>Buscar nuevos archivos...</b><p>Busca nuevos archivos (fuentes, *.ui, *.idl) en el directorio del proyecto y en los subdirectorios registrados.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2983"/> + <location filename="Project/Project.py" line="2988"/> <source>Project properties</source> <translation>Propiedades del proyecto</translation> </message> <message> - <location filename="Project/Project.py" line="2983"/> + <location filename="Project/Project.py" line="2988"/> <source>&Properties...</source> <translation>&Propiedades...</translation> </message> <message> - <location filename="Project/Project.py" line="2986"/> + <location filename="Project/Project.py" line="2991"/> <source>Show the project properties</source> <translation>Ver las propiedades del proyecto</translation> </message> <message> - <location filename="Project/Project.py" line="2987"/> + <location filename="Project/Project.py" line="2992"/> <source><b>Properties...</b><p>This shows a dialog to edit the project properties.</p></source> <translation><b>Propiedades...</b><p>Muestra un diálogo para editar las propiedades del proyecto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2994"/> - <source>User project properties</source> - <translation>Propiedades del usuario del proyecto</translation> - </message> - <message> - <location filename="Project/Project.py" line="2994"/> - <source>&User Properties...</source> - <translation>Propiedades del &Usuario...</translation> - </message> - <message> - <location filename="Project/Project.py" line="2997"/> - <source>Show the user specific project properties</source> - <translation>Muestra propiedades del proyecto específicas del usuario</translation> - </message> - <message> <location filename="Project/Project.py" line="2999"/> + <source>User project properties</source> + <translation>Propiedades del usuario del proyecto</translation> + </message> + <message> + <location filename="Project/Project.py" line="2999"/> + <source>&User Properties...</source> + <translation>Propiedades del &Usuario...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3002"/> + <source>Show the user specific project properties</source> + <translation>Muestra propiedades del proyecto específicas del usuario</translation> + </message> + <message> + <location filename="Project/Project.py" line="3004"/> <source><b>User Properties...</b><p>This shows a dialog to edit the user specific project properties.</p></source> <translation><b>Propiedades del Usuario...</b><p>Abre un diálogo par editar las propiedades del proyecto específicas del usuario.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3006"/> + <location filename="Project/Project.py" line="3011"/> <source>Filetype Associations</source> <translation>Asociación de tipos de archivo</translation> </message> <message> - <location filename="Project/Project.py" line="3006"/> - <source>Filetype Associations...</source> - <translation>Asociación de tipos de archivo...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3009"/> - <source>Show the project filetype associations</source> - <translation>Ver las asociaciones del proyecto</translation> - </message> - <message> <location filename="Project/Project.py" line="3011"/> + <source>Filetype Associations...</source> + <translation>Asociación de tipos de archivo...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3014"/> + <source>Show the project filetype associations</source> + <translation>Ver las asociaciones del proyecto</translation> + </message> + <message> + <location filename="Project/Project.py" line="3016"/> <source><b>Filetype Associations...</b><p>This shows a dialog to edit the filetype associations of the project. These associations determine the type (source, form, interface or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.</p></source> <translation><b>Asociaciones de Tipo de Archivo...</b><p>Muestra un diálogo para editar las asociaciones de los tipos de archivos del proyecto. Estas asociaciones determinan el tipo (fuente, formulario, interfaz u otras) con un patrón de nombres de archivo. Se usan cuando se añade un archivo al proyecto y cuando se realiza una búsqueda de nuevos archivos.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3037"/> + <location filename="Project/Project.py" line="3042"/> <source>Debugger Properties</source> <translation>Propiedades del depurador</translation> </message> <message> - <location filename="Project/Project.py" line="3037"/> + <location filename="Project/Project.py" line="3042"/> <source>Debugger &Properties...</source> <translation>&Propiedades del depurador...</translation> </message> <message> - <location filename="Project/Project.py" line="3040"/> + <location filename="Project/Project.py" line="3045"/> <source>Show the debugger properties</source> <translation>Muestra las propiedades del depurador</translation> </message> <message> - <location filename="Project/Project.py" line="3041"/> + <location filename="Project/Project.py" line="3046"/> <source><b>Debugger Properties...</b><p>This shows a dialog to edit project specific debugger settings.</p></source> <translation><b>Propiedades del Depurador...</b><p>Abre un diálogo par editar las propiedades del depurador específicas del proyecto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3048"/> + <location filename="Project/Project.py" line="3053"/> <source>Load</source> <translation>Cargar</translation> </message> <message> - <location filename="Project/Project.py" line="3048"/> + <location filename="Project/Project.py" line="3053"/> <source>&Load</source> <translation>&Cargar</translation> </message> <message> - <location filename="Project/Project.py" line="3051"/> + <location filename="Project/Project.py" line="3056"/> <source>Load the debugger properties</source> <translation>Cargar las propiedades del depurador</translation> </message> <message> - <location filename="Project/Project.py" line="3052"/> + <location filename="Project/Project.py" line="3057"/> <source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source> <translation><b>Cargar Propiedades del Depurador</b><p>Carga las opciones de configuración del depurador específicas del proyecto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3059"/> + <location filename="Project/Project.py" line="3064"/> <source>Save</source> <translation>Guardar</translation> </message> <message> - <location filename="Project/Project.py" line="3062"/> + <location filename="Project/Project.py" line="3067"/> <source>Save the debugger properties</source> <translation>Guardar propiedades del depurador</translation> </message> <message> - <location filename="Project/Project.py" line="3063"/> + <location filename="Project/Project.py" line="3068"/> <source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source> <translation><b>Guardar Propiedades del Depurador</b><p>Guarda las opciones de configuración del depurador específicas del proyecto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3070"/> + <location filename="Project/Project.py" line="3075"/> <source>Delete</source> <translation>Borrar</translation> </message> <message> - <location filename="Project/Project.py" line="3070"/> + <location filename="Project/Project.py" line="3075"/> <source>&Delete</source> <translation>&Borrar</translation> </message> <message> - <location filename="Project/Project.py" line="3073"/> + <location filename="Project/Project.py" line="3078"/> <source>Delete the debugger properties</source> <translation>Borrar las propiedades del depurador</translation> </message> <message> - <location filename="Project/Project.py" line="3074"/> + <location filename="Project/Project.py" line="3079"/> <source><b>Delete Debugger Properties</b><p>This deletes the file containing the project specific debugger settings.</p></source> <translation><b>Borrar Propiedades del Depurador</b><p>Borra el archivo que contiene las opciones de configuración del depurador específicas del proyecto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3082"/> + <location filename="Project/Project.py" line="3087"/> <source>Reset</source> <translation>Reiniciar</translation> </message> <message> - <location filename="Project/Project.py" line="3082"/> + <location filename="Project/Project.py" line="3087"/> <source>&Reset</source> <translation>&Reiniciar</translation> </message> <message> - <location filename="Project/Project.py" line="3085"/> + <location filename="Project/Project.py" line="3090"/> <source>Reset the debugger properties</source> <translation>Restablecer las propiedades del depurador</translation> </message> <message> - <location filename="Project/Project.py" line="3086"/> + <location filename="Project/Project.py" line="3091"/> <source><b>Reset Debugger Properties</b><p>This resets the project specific debugger settings.</p></source> <translation><b>Restablecer Propiedades del Depurador</b><p>Restablece las opciones de configuración del depurador específicas del proyecto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3095"/> + <location filename="Project/Project.py" line="3100"/> <source>Load session</source> <translation>Cargar sesión</translation> </message> <message> - <location filename="Project/Project.py" line="3098"/> + <location filename="Project/Project.py" line="3103"/> <source>Load the projects session file.</source> <translation>Cargar archivo de sesión de proyectos.</translation> </message> <message> - <location filename="Project/Project.py" line="3099"/> + <location filename="Project/Project.py" line="3104"/> <source><b>Load session</b><p>This loads the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Cargar sesión</b><p>Carga el archivo de sesión de proyecto. La sesión consiste en los datos siguientes.<br>- todos los archivos de fuentes abiertos<br>- todos los puntos de interrupción<br>- todos los argumentos de línea de comandos<br>- el directorio de trabajo<br>- el flag de reporte de excepciones</p></translation> </message> <message> - <location filename="Project/Project.py" line="3112"/> + <location filename="Project/Project.py" line="3117"/> <source>Save session</source> <translation>Guardar sesión</translation> </message> <message> - <location filename="Project/Project.py" line="3115"/> + <location filename="Project/Project.py" line="3120"/> <source>Save the projects session file.</source> <translation>Guardar archivos de sessión de proyecto.</translation> </message> <message> - <location filename="Project/Project.py" line="3116"/> + <location filename="Project/Project.py" line="3121"/> <source><b>Save session</b><p>This saves the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Guardar sesión</b><p>Guarda el archivo de sesión de proyecto. La sesión consiste en los datos siguientes.<br>- todos los archivos de fuentes abiertos<br>- todos los puntos de interrupción<br>- todos los argumentos de línea de comandos<br>- el directorio de trabajo<br>- el flag de reporte de excepciones</p></translation> </message> <message> - <location filename="Project/Project.py" line="3129"/> + <location filename="Project/Project.py" line="3134"/> <source>Delete session</source> <translation>Borrar sesión</translation> </message> <message> - <location filename="Project/Project.py" line="3132"/> + <location filename="Project/Project.py" line="3137"/> <source>Delete the projects session file.</source> <translation>Borrar el archivo de sesión de proyecto.</translation> </message> <message> - <location filename="Project/Project.py" line="3133"/> + <location filename="Project/Project.py" line="3138"/> <source><b>Delete session</b><p>This deletes the projects session file</p></source> <translation><b>Borrar sesión</b><p>Borra el archivo de sesión del proyecto</p></translation> </message> <message> - <location filename="Project/Project.py" line="3142"/> - <source>Code Metrics</source> - <translation>Métricas de código</translation> - </message> - <message> - <location filename="Project/Project.py" line="3142"/> - <source>&Code Metrics...</source> - <translation>Métricas de &código...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3145"/> - <source>Show some code metrics for the project.</source> - <translation>Muestra algunas métricas del código para este proyecto.</translation> - </message> - <message> <location filename="Project/Project.py" line="3147"/> + <source>Code Metrics</source> + <translation>Métricas de código</translation> + </message> + <message> + <location filename="Project/Project.py" line="3147"/> + <source>&Code Metrics...</source> + <translation>Métricas de &código...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3150"/> + <source>Show some code metrics for the project.</source> + <translation>Muestra algunas métricas del código para este proyecto.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3152"/> <source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source> <translation><b>Métricas de Código...</b><p>Muestra algunas métricas de código para todos los archivos Python en el proyecto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3154"/> + <location filename="Project/Project.py" line="3159"/> <source>Python Code Coverage</source> <translation>Cobertura de Código Python</translation> </message> <message> - <location filename="Project/Project.py" line="3154"/> - <source>Code Co&verage...</source> - <translation>Co&bertura de código...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3157"/> - <source>Show code coverage information for the project.</source> - <translation>Muestra información de cobertura de código para el proyecto.</translation> - </message> - <message> <location filename="Project/Project.py" line="3159"/> + <source>Code Co&verage...</source> + <translation>Co&bertura de código...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3162"/> + <source>Show code coverage information for the project.</source> + <translation>Muestra información de cobertura de código para el proyecto.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3164"/> <source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source> <translation><b>Cobertura de Código...</b><p>Muestra la información de cobertura de código para todos los archivos Python en el proyecto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3839"/> + <location filename="Project/Project.py" line="3844"/> <source>Profile Data</source> <translation>Datos de perfil</translation> </message> <message> - <location filename="Project/Project.py" line="3167"/> - <source>&Profile Data...</source> - <translation>Datos de &pefil...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3170"/> - <source>Show profiling data for the project.</source> - <translation>Mostrar datos de profiling para el proyecto.</translation> - </message> - <message> <location filename="Project/Project.py" line="3172"/> + <source>&Profile Data...</source> + <translation>Datos de &pefil...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3175"/> + <source>Show profiling data for the project.</source> + <translation>Mostrar datos de profiling para el proyecto.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3177"/> <source><b>Profile Data...</b><p>This shows the profiling data for the project.</p></source> <translation><b>Datos de Profiling...</b><p>Muestra datos de profiling para el proyecto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3892"/> + <location filename="Project/Project.py" line="3897"/> <source>Application Diagram</source> <translation>Diagrama de Aplicación</translation> </message> <message> - <location filename="Project/Project.py" line="3179"/> - <source>&Application Diagram...</source> - <translation>Diagrama de &Aplicación...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3182"/> - <source>Show a diagram of the project.</source> - <translation>Mostrar diagrama del proyecto.</translation> - </message> - <message> <location filename="Project/Project.py" line="3184"/> + <source>&Application Diagram...</source> + <translation>Diagrama de &Aplicación...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3187"/> + <source>Show a diagram of the project.</source> + <translation>Mostrar diagrama del proyecto.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3189"/> <source><b>Application Diagram...</b><p>This shows a diagram of the project.</p></source> <translation><b>Diagrama de Aplicación...</b><p>Muestra un diagrama del proyecto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="4023"/> + <location filename="Project/Project.py" line="4028"/> <source>Create Package List</source> <translation>Crear Lista del Paquete</translation> </message> <message> - <location filename="Project/Project.py" line="3193"/> + <location filename="Project/Project.py" line="3198"/> <source>Create &Package List</source> <translation>Crear Lista del &Paquete</translation> </message> <message> - <location filename="Project/Project.py" line="4183"/> + <location filename="Project/Project.py" line="4188"/> <source>Create Plugin Archive</source> <translation>Crear Archivo de Plugin</translation> </message> <message> - <location filename="Project/Project.py" line="3207"/> + <location filename="Project/Project.py" line="3212"/> <source>Create Plugin &Archive</source> <translation>Crear &Archivo de Plugin</translation> </message> <message> - <location filename="Project/Project.py" line="3256"/> - <source>&Project</source> - <translation>&Proyecto</translation> - </message> - <message> - <location filename="Project/Project.py" line="3257"/> - <source>Open &Recent Projects</source> - <translation>Abrir Proyectos &Recientes</translation> - </message> - <message> - <location filename="Project/Project.py" line="3258"/> - <source>&Version Control</source> - <translation>Control de &Versiones</translation> - </message> - <message> <location filename="Project/Project.py" line="3261"/> - <source>Chec&k</source> - <translation>Veri&ficar</translation> + <source>&Project</source> + <translation>&Proyecto</translation> + </message> + <message> + <location filename="Project/Project.py" line="3262"/> + <source>Open &Recent Projects</source> + <translation>Abrir Proyectos &Recientes</translation> </message> <message> <location filename="Project/Project.py" line="3263"/> - <source>Sho&w</source> - <translation>V&er</translation> - </message> - <message> - <location filename="Project/Project.py" line="3264"/> - <source>&Diagrams</source> - <translation>&Diagramas</translation> - </message> - <message> - <location filename="Project/Project.py" line="3265"/> - <source>Session</source> - <translation>Sesión</translation> + <source>&Version Control</source> + <translation>Control de &Versiones</translation> </message> <message> <location filename="Project/Project.py" line="3266"/> - <source>Source &Documentation</source> - <translation>Origen de &Documentación </translation> + <source>Chec&k</source> + <translation>Veri&ficar</translation> </message> <message> <location filename="Project/Project.py" line="3268"/> - <source>Debugger</source> - <translation>Depurador</translation> + <source>Sho&w</source> + <translation>V&er</translation> </message> <message> <location filename="Project/Project.py" line="3269"/> + <source>&Diagrams</source> + <translation>&Diagramas</translation> + </message> + <message> + <location filename="Project/Project.py" line="3270"/> + <source>Session</source> + <translation>Sesión</translation> + </message> + <message> + <location filename="Project/Project.py" line="3271"/> + <source>Source &Documentation</source> + <translation>Origen de &Documentación </translation> + </message> + <message> + <location filename="Project/Project.py" line="3273"/> + <source>Debugger</source> + <translation>Depurador</translation> + </message> + <message> + <location filename="Project/Project.py" line="3274"/> <source>Pac&kagers</source> <translation>Empa&quetadores</translation> </message> <message> - <location filename="Project/Project.py" line="3371"/> + <location filename="Project/Project.py" line="3376"/> <source>Project</source> <translation>Proyecto</translation> </message> <message> - <location filename="Project/Project.py" line="3432"/> + <location filename="Project/Project.py" line="3437"/> <source>&Clear</source> <translation>&Borrar</translation> </message> <message> - <location filename="Project/Project.py" line="3542"/> + <location filename="Project/Project.py" line="3547"/> <source>Search New Files</source> <translation>Buscar nuevos archivos</translation> </message> <message> - <location filename="Project/Project.py" line="3542"/> + <location filename="Project/Project.py" line="3547"/> <source>There were no new files found to be added.</source> <translation>No se han encontrado nuevos archivos para ser añadidos.</translation> </message> <message> - <location filename="Project/Project.py" line="3680"/> + <location filename="Project/Project.py" line="3685"/> <source>Version Control System</source> <translation>Sistema de control de versiones</translation> </message> <message> - <location filename="Project/Project.py" line="3772"/> + <location filename="Project/Project.py" line="3777"/> <source>Coverage Data</source> <translation>Datos de Cobertura</translation> </message> <message> - <location filename="Project/Project.py" line="3818"/> + <location filename="Project/Project.py" line="3823"/> <source>There is no main script defined for the current project. Aborting</source> <translation>No hay script principal definido para el proyecto actual. Abortando</translation> </message> <message> - <location filename="Project/Project.py" line="3793"/> + <location filename="Project/Project.py" line="3798"/> <source>Code Coverage</source> <translation>Cobertura de codigo</translation> </message> <message> - <location filename="Project/Project.py" line="3793"/> + <location filename="Project/Project.py" line="3798"/> <source>Please select a coverage file</source> <translation>Por favor seleccione un archivo de cobertura</translation> </message> <message> - <location filename="Project/Project.py" line="3839"/> + <location filename="Project/Project.py" line="3844"/> <source>Please select a profile file</source> <translation>Por favor seleccione un archivo de profiling</translation> </message> <message> - <location filename="Project/Project.py" line="3892"/> + <location filename="Project/Project.py" line="3897"/> <source>Include module names?</source> <translation>¿Incluir nombres de módulos?</translation> </message> <message> - <location filename="Project/Project.py" line="3996"/> + <location filename="Project/Project.py" line="4001"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation><p>El archivo <b>PKGLIST</b> ya existe.</p><p>¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="Project/Project.py" line="4040"/> + <location filename="Project/Project.py" line="4045"/> <source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source> <translation><p>El archivo <b>PKGLIST</b> no existe. Abortando...</p></translation> </message> <message> - <location filename="Project/Project.py" line="4048"/> + <location filename="Project/Project.py" line="4053"/> <source>The project does not have a main script defined. Aborting...</source> <translation>No hay script principal definido para el proyecto actual. Abortando...</translation> </message> @@ -27921,12 +27979,12 @@ <translation>Registrando Tipo de Proyecto</translation> </message> <message> - <location filename="Project/Project.py" line="3222"/> + <location filename="Project/Project.py" line="3227"/> <source>Create Plugin Archive (Snapshot)</source> <translation>Crear un Archivo de Plugin (Snapshot)</translation> </message> <message> - <location filename="Project/Project.py" line="3222"/> + <location filename="Project/Project.py" line="3227"/> <source>Create Plugin Archive (&Snapshot)</source> <translation>Crear un Archivo de Plugin (&Snapshot)</translation> </message> @@ -27946,22 +28004,22 @@ <translation>Introduzca el patrón de ruta para los archivos de traducción (use '%language%' in lugar del código de idioma):</translation> </message> <message> - <location filename="Project/Project.py" line="3021"/> + <location filename="Project/Project.py" line="3026"/> <source>Lexer Associations</source> <translation>Asociaciones de Analizador Léxico</translation> </message> <message> - <location filename="Project/Project.py" line="3021"/> - <source>Lexer Associations...</source> - <translation>Asociaciones de Analizador Léxico...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3024"/> - <source>Show the project lexer associations (overriding defaults)</source> - <translation>Ver las asociaciones de analizador léxico del proyecto (sobreescribiendo valores por defecto)</translation> - </message> - <message> <location filename="Project/Project.py" line="3026"/> + <source>Lexer Associations...</source> + <translation>Asociaciones de Analizador Léxico...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3029"/> + <source>Show the project lexer associations (overriding defaults)</source> + <translation>Ver las asociaciones de analizador léxico del proyecto (sobreescribiendo valores por defecto)</translation> + </message> + <message> + <location filename="Project/Project.py" line="3031"/> <source><b>Lexer Associations...</b><p>This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.</p></source> <translation><b>Asociaciones de Analizador Léxico ...</b><p>Muestra un diálogo para editar las asociaciones de analizador léxico del proyecto. Estas asociaciones sobreescriben las asociaciones de analizador léxico globales. Los analizadores léxicos se utilizan para resaltar el texto en el editor.</p></translation> </message> @@ -28086,72 +28144,72 @@ <translation><p>El directorio de proyecto <b>{0}</b> no pudo ser creado.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3197"/> + <location filename="Project/Project.py" line="3202"/> <source>Create an initial PKGLIST file for an eric5 plugin.</source> <translation>Crear un archivo inicial PKGLIST para un plugin para eric5.</translation> </message> <message> - <location filename="Project/Project.py" line="3199"/> + <location filename="Project/Project.py" line="3204"/> <source><b>Create Package List</b><p>This creates an initial list of files to include in an eric5 plugin archive. The list is created from the project file.</p></source> <translation><b>Crear Lista del Paquete</b><p>Crea una lista inicial de archivos a incluir en un archivo para plugin de eric5. Esta lista se crea a partir del archivo de proyecto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3211"/> + <location filename="Project/Project.py" line="3216"/> <source>Create an eric5 plugin archive file.</source> <translation>Crear un archivo de plugin para eric5.</translation> </message> <message> - <location filename="Project/Project.py" line="3213"/> + <location filename="Project/Project.py" line="3218"/> <source><b>Create Plugin Archive</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name.</p></source> <translation><b>Crear Archivo de Plugin</b><p>Crea un archivo de plugin para eric5 utilizando la lista de archivos dada en el archivo PKGLIST. El nombre de archivo se determina a partir del nombr del script principal.</p> </translation> </message> <message> - <location filename="Project/Project.py" line="3226"/> + <location filename="Project/Project.py" line="3231"/> <source>Create an eric5 plugin archive file (snapshot release).</source> <translation>Crear un archivo de plugin de eric5 (snapshot release).</translation> </message> <message> - <location filename="Project/Project.py" line="3228"/> + <location filename="Project/Project.py" line="3233"/> <source><b>Create Plugin Archive (Snapshot)</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name. The version entry of the main script is modified to reflect a snapshot release.</p></source> <translation><b>Crear un archivo de plugin (Snapshot)</b><p>Crea un archivo de plugin utilizando la lista de archivos proporcionada en el archivo PKGLIST. El nombre del archivo se determina por el nombre del script principal. La entrada para la versión del script proncipal se modifica para reflejar una versión snapshot.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3671"/> + <location filename="Project/Project.py" line="3676"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Reverting override.</p><p>{1}</p></source> <translation><p>El VCS seleccionado <b>{0}</b> no ha sido encontrado.<br>Revirtiendo sobreescritura.</p><p>{1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="3680"/> + <location filename="Project/Project.py" line="3685"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Disabling version control.</p><p>{1}</p></source> <translation><p>El VCS seleccionado <b>{0}</b> no ha sido encontrado.<br>Deshabilitando control de versiones.</p><p>{1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4023"/> + <location filename="Project/Project.py" line="4028"/> <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> <translation><p>El archivo <b>PKGLIST</b> no puede ser creado.</p><p>Causa: {0}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4060"/> + <location filename="Project/Project.py" line="4065"/> <source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source> <translation><p>El archivo <b>PKGLIST</b> no puede ser leido.</p><p>Causa: {0}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4071"/> + <location filename="Project/Project.py" line="4076"/> <source><p>The eric5 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation><p>El archivo de plugin de eric5 <b>{0}</b> no ha podido ser creado. Abortando...</p><p>Razón: {1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4091"/> + <location filename="Project/Project.py" line="4096"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation><p>El fichero<b>{0}</b> no ha podido ser almacenado en el archivo. Va a ser ignorado.</p><p>Causa: {1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4103"/> + <location filename="Project/Project.py" line="4108"/> <source><p>The eric5 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation><p>El archivo de plugin de eric5 <b>{0}</b> se ha creado satisfactoriamente.</p></translation> </message> <message> - <location filename="Project/Project.py" line="4183"/> + <location filename="Project/Project.py" line="4188"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation><p>El archivo de plugin<b>{0}</b> no puede ser leido.</p><p>Causa: {1}</p></translation> </message> @@ -29830,22 +29888,22 @@ <context> <name>Purge</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="91"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="97"/> <source>Purge All Files</source> <translation>Purgar Todos los Archivos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="98"/> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation>¿Desea realmente borrar todos los archivos no rastreados por Mercurial (incluyendo los ignorados)?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="101"/> <source>Purge Files</source> <translation>Purgar Archivos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="102"/> <source>Do really want to delete files not tracked by Mercurial?</source> <translation>¿Desea realmente borrar los archivos no rastreados por Mercurial ?</translation> </message> @@ -31885,177 +31943,177 @@ <context> <name>Queues</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="256"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="276"/> <source>New Patch</source> <translation>Nuevo Patch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="325"/> <source>Update Current Patch</source> <translation>Actualizar Patch Actual</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="356"/> - <source>Pop Patches</source> - <translation>Hacer Pop de Patches</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="360"/> - <source>Push Patches</source> - <translation>Hacer Push de Patches</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="364"/> - <source>Go to Patch</source> - <translation>Ir al Patch</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> - <source>Select Patch</source> - <translation>Seleccionar Patch</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="376"/> + <source>Pop Patches</source> + <translation>Hacer Pop de Patches</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="380"/> + <source>Push Patches</source> + <translation>Hacer Push de Patches</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="384"/> + <source>Go to Patch</source> + <translation>Ir al Patch</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="515"/> + <source>Select Patch</source> + <translation>Seleccionar Patch</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="396"/> <source>Select the target patch name:</source> <translation>Seleccionar el nombre del patch de destino:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="515"/> <source>No patches to select from.</source> <translation>No hay patches que seleccionar.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="447"/> <source>Finish Applied Patches</source> <translation>Terminar Patches Aplicados</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="459"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="479"/> <source>Rename Patch</source> <translation>Renombrar Patch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="501"/> <source>Select the patch to be deleted:</source> <translation>Seleccionar el patch a eliminar:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="490"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="510"/> <source>Delete Patch</source> <translation>Eliminar Patch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="535"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="555"/> <source>Fold Patches</source> <translation>Fold Patches</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="551"/> <source>No patches selected.</source> <translation>No hay patches seleccionados.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="535"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="555"/> <source>No patches available to be folded.</source> <translation>No hay patches disponibles sobre los que hacer fold.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="559"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="579"/> <source>List Guards</source> <translation>Listar Guards</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="559"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="579"/> <source>No patches available to list guards for.</source> <translation>No hay patches disponibles para los que listar guards.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="594"/> - <source>Define Guards</source> - <translation>Definir Guards</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> - <source>No patches available to define guards for.</source> - <translation>No hay patches disponibles para los que definir guards.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> - <source>Drop All Guards</source> - <translation>Abandonar todos los Guards</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="614"/> + <source>Define Guards</source> + <translation>Definir Guards</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <source>No patches available to define guards for.</source> + <translation>No hay patches disponibles para los que definir guards.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <source>Drop All Guards</source> + <translation>Abandonar todos los Guards</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="634"/> <source>Select the patch to drop guards for (leave empty for the current patch):</source> <translation>Seleccionar el patch para el que abandonar los guards (dejar en blanco para el patch actual):</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="693"/> <source>Set Active Guards</source> <translation>Establecer Guards Activos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="693"/> <source>No guards available to select from.</source> <translation>No hay guards disponibles para seleccionar.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="691"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="715"/> <source>Deactivate Guards</source> <translation>Desactivar Guards</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="753"/> <source>Create New Queue</source> <translation>Crear Nueva Cola</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="755"/> <source>Rename Active Queue</source> <translation>Renombrar Cola Activa</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="757"/> - <source>Error while creating a new queue.</source> - <translation>Error al crear una nueva cola.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/> - <source>Error while renaming the active queue.</source> - <translation>Error al renombrar la cola activa.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="787"/> - <source>Purge Queue</source> - <translation>Purgar Cola</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="789"/> + <source>Error while creating a new queue.</source> + <translation>Error al crear una nueva cola.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="792"/> + <source>Error while renaming the active queue.</source> + <translation>Error al renombrar la cola activa.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="819"/> + <source>Purge Queue</source> + <translation>Purgar Cola</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="821"/> <source>Delete Queue</source> <translation>Borrar Cola</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="823"/> <source>Activate Queue</source> <translation>Activar Cola</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="820"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="860"/> <source>Error while purging the queue.</source> <translation>Error al purgar la cola.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="862"/> <source>Error while deleting the queue.</source> <translation>Error al borrar la cola.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="864"/> <source>Error while setting the active queue.</source> <translation>Error al establecer la cola activa.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="847"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="887"/> <source>Available Queues</source> <translation>Colas Disponibles</translation> </message> @@ -48848,17 +48906,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1668"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiquetas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1676"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1683"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -48869,31 +48927,31 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1566"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1662"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Pista</b></td><td></td></tr> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1680"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Padres</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1168"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Padre #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1116"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1184"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -48902,7 +48960,7 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1214"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -48919,7 +48977,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message>
--- a/i18n/eric5_fr.ts Wed Aug 31 19:28:49 2011 +0200 +++ b/i18n/eric5_fr.ts Wed Aug 31 19:35:11 2011 +0200 @@ -1564,62 +1564,62 @@ <context> <name>Bookmarks</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="129"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="147"/> <source>Delete Bookmark</source> <translation type="unfinished">Supprimer le signet</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="147"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="159"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="187"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="220"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="304"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="304"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="316"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="337"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="337"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="334"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="349"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -16771,250 +16771,265 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="234"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> - <source>Creating Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> + <source>Creating Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="331"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="351"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="427"/> - <source>Commiting changes to Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="475"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="523"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="558"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="622"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="686"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="746"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="791"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="776"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/> <source>Reverting changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="869"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1047"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1224"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1298"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> <source>Select number of entries to show.</source> <translation type="unfinished">Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1477"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1509"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1599"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1656"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1736"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1856"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1679"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> - <source>Mercurial Bisect ({0})</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> - <source>Preview changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> - <source>Identifying project directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> - <source>Create .hgignore file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> - <source>Removing files from the Mercurial repository only</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> - <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2006"/> - <source>Identifying changegroup file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> - <source>Backing out changeset</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <source>Mercurial Bisect ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2098"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <source>Identifying project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <source>Create .hgignore file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2225"/> + <source>Removing files from the Mercurial repository only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2108"/> + <source>Identifying changegroup file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2281"/> + <source>Backing out changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2024"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2306"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="454"/> + <source>Committing changes to Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <source>Mercurial Command Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2344"/> + <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -17094,12 +17109,12 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="110"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="110"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -17472,17 +17487,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> <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/BookmarksExtension/HgBookmarksInOutDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="165"/> <source>no bookmarks found</source> <translation type="unfinished"></translation> </message> @@ -17572,17 +17587,17 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> <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/BookmarksExtension/HgBookmarksListDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="150"/> <source>no bookmarks defined</source> <translation type="unfinished"></translation> </message> @@ -17701,6 +17716,44 @@ </message> </context> <context> + <name>HgClient</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="76"/> + <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/HgClient.py" line="117"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="119"/> + <source>Received data on unexpected channel.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="124"/> + <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="128"/> + <source>'capabilities' message did not contain any capability.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="136"/> + <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <source>'encoding' message did not contain any encoding.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/> @@ -17914,12 +17967,12 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -17987,42 +18040,42 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/> <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/HgDiffDialog.py" line="178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="206"/> <source>There is no difference.</source> <translation type="unfinished">Aucune différence.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="347"/> <source>Save Diff</source> <translation type="unfinished">Enregistrer Diff</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="316"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">Fichiers Patch (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="347"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="289"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="333"/> <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/HgDiffDialog.py" line="109"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="112"/> <source>Patch Contents</source> <translation type="unfinished"></translation> </message> @@ -18221,7 +18274,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="310"/> <source>Revision</source> <translation type="unfinished">Révision</translation> </message> @@ -18296,17 +18349,17 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> <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/GpgExtension/HgGpgSignaturesDialog.py" line="128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="147"/> <source>no signatures found</source> <translation type="unfinished"></translation> </message> @@ -18344,17 +18397,17 @@ <translation type="unfinished">Sélectionner le champ à filtrer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1082"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/> <source>Revision</source> <translation type="unfinished">Révision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1079"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1128"/> <source>Author</source> <translation type="unfinished">Auteur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> <source>Message</source> <translation type="unfinished">Message</translation> </message> @@ -18494,42 +18547,42 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> <source>Added</source> <translation type="unfinished">Ajouté</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="116"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> <source>Modified</source> <translation type="unfinished">Modifié</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> <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="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="492"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="476"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -18569,7 +18622,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/> <source>All</source> <translation type="unfinished">Tous</translation> </message> @@ -18584,7 +18637,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> <source>Bookmarks</source> <translation type="unfinished">Signets</translation> </message> @@ -18672,106 +18725,106 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="55"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="56"/> <source><b>Processing your request, please wait...</b></source> <translation type="unfinished"><b>Votre requête est en cours d'execution, merci de patienter...</b></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="66"/> <source>Revision</source> <translation type="unfinished">Révision</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> <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/HgLogDialog.py" line="225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="259"/> <source>No log available for '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="258"/> - <source>diff to {0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> - <source>Branches: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="268"/> - <source>Tags: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/> - <source>Parents: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="275"/> - <source><i>Author: {0}</i><br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="278"/> - <source><i>Date: {0}, {1}</i><br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> + <source>diff to {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> + <source>Branches: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="302"/> + <source>Tags: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/> + <source>Parents: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> + <source><i>Author: {0}</i><br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <source><i>Date: {0}, {1}</i><br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> <source>Added {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> <source>Modified {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="338"/> <source>Deleted {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="201"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="226"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="228"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="231"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="288"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> <source>Added {0} (copied from {1})<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="271"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> @@ -20226,37 +20279,37 @@ <translation type="unfinished">Supprimer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> <source>Unsaved Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> <source>Remove Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> <source>Do you really want to remove the selected guards?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> <source>Apply Guard Definitions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/> <source>The Mercurial process did not finish in time.</source> <translation type="unfinished"></translation> </message> @@ -20330,17 +20383,17 @@ <translation type="unfinished">Message de commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> <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/QueuesExtension/HgQueuesHeaderDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="189"/> <source>Error: </source> <translation type="unfinished"></translation> </message> @@ -20358,12 +20411,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="89"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="103"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="94"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> @@ -20448,42 +20501,42 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> <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/QueuesExtension/HgQueuesListDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="219"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="50"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> <source>applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> - <source>guarded</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="53"/> + <source>guarded</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="54"/> <source>missing</source> <translation type="unfinished">manquant</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="292"/> <source>unknown</source> <translation type="unfinished">inconnu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> <source>not applied</source> <translation type="unfinished"></translation> </message> @@ -20521,7 +20574,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="111"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="122"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> @@ -20642,12 +20695,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="60"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="62"/> <source>Refresh</source> <translation type="unfinished">Rafraichir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="62"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="64"/> <source>Press to refresh the queues list</source> <translation type="unfinished"></translation> </message> @@ -21155,7 +21208,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="188"/> <source>Mercurial Status</source> <translation type="unfinished"></translation> </message> @@ -21231,107 +21284,107 @@ <translation type="unfinished">Cliquer pour rafraichir l'affichage</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="62"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="63"/> <source>Commit changes to repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/> <source>Add to repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="71"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="72"/> <source>Revert changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="76"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="77"/> <source>Adjust column sizes</source> <translation type="unfinished">Ajuster la largeur des colonnes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>added</source> <translation type="unfinished">ajouté</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> - <source>modified</source> - <translation type="unfinished">modifié</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> - <source>removed</source> - <translation type="unfinished"></translation> + <source>modified</source> + <translation type="unfinished">modifié</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> - <source>not tracked</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> - <source>normal</source> - <translation type="unfinished">normal</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> - <source>ignored</source> - <translation type="unfinished">ignoré</translation> + <source>removed</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> + <source>not tracked</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> + <source>normal</source> + <translation type="unfinished">normal</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> + <source>ignored</source> + <translation type="unfinished">ignoré</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> <source>missing</source> <translation type="unfinished">manquant</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="238"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="238"/> <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/HgStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="540"/> <source>Commit</source> <translation type="unfinished">Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="642"/> <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="529"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="567"/> <source>Add</source> <translation type="unfinished">Ajouter</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="567"/> <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="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="625"/> <source>Revert</source> <translation type="unfinished">Recouvrir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="69"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="70"/> <source>Remove from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="588"/> <source>Remove</source> <translation type="unfinished">Supprimer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="625"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> @@ -21406,17 +21459,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="68"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="74"/> <source>Restore missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="452"/> <source>all</source> <translation type="unfinished"></translation> </message> @@ -21426,12 +21479,12 @@ <translation type="obsolete">Différence</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="642"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="540"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> @@ -21439,12 +21492,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="153"/> <source>Mercurial status checked successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="119"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="100"/> <source>Could not start the Mercurial process.</source> <translation type="unfinished"></translation> </message> @@ -21535,32 +21588,32 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="86"/> <source>Mercurial Branches List</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="87"/> <source>Status</source> <translation type="unfinished">Etat (status)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> <source>Process Generation Error</source> <translation type="unfinished">Erreur du processus</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> <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/HgTagBranchListDialog.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="247"/> <source>active</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="252"/> <source>yes</source> <translation type="unfinished">oui</translation> </message> @@ -29209,17 +29262,17 @@ <translation>Création d'un répertoire projet</translation> </message> <message> - <location filename="Project/Project.py" line="2869"/> + <location filename="Project/Project.py" line="2874"/> <source>New project</source> <translation>Nouveau projet</translation> </message> <message> - <location filename="Project/Project.py" line="2882"/> + <location filename="Project/Project.py" line="2887"/> <source>Open project</source> <translation>Ouvir un projet</translation> </message> <message> - <location filename="Project/Project.py" line="2916"/> + <location filename="Project/Project.py" line="2921"/> <source>Save project as</source> <translation>Enregistrer le projet sous</translation> </message> @@ -29239,232 +29292,232 @@ <translation>Le projet courant a des modifications non enregistrées.</translation> </message> <message> - <location filename="Project/Project.py" line="3059"/> + <location filename="Project/Project.py" line="3064"/> <source>&Save</source> <translation>&Enregistrer</translation> </message> <message> - <location filename="Project/Project.py" line="2869"/> - <source>&New...</source> - <translation>&Nouveau...</translation> - </message> - <message> - <location filename="Project/Project.py" line="2873"/> - <source>Generate a new project</source> - <translation>Génerer un nouveau projet</translation> - </message> - <message> <location filename="Project/Project.py" line="2874"/> + <source>&New...</source> + <translation>&Nouveau...</translation> + </message> + <message> + <location filename="Project/Project.py" line="2878"/> + <source>Generate a new project</source> + <translation>Génerer un nouveau projet</translation> + </message> + <message> + <location filename="Project/Project.py" line="2879"/> <source><b>New...</b><p>This opens a dialog for entering the info for a new project.</p></source> <translation><b>Nouveau...</b><p>Ouvre une boite de dialogue pour entrer les paramètres d'un nouveau projet.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2882"/> - <source>&Open...</source> - <translation>&Ouvrir...</translation> - </message> - <message> - <location filename="Project/Project.py" line="2886"/> - <source>Open an existing project</source> - <translation>Ouvrir un projet existant</translation> - </message> - <message> <location filename="Project/Project.py" line="2887"/> + <source>&Open...</source> + <translation>&Ouvrir...</translation> + </message> + <message> + <location filename="Project/Project.py" line="2891"/> + <source>Open an existing project</source> + <translation>Ouvrir un projet existant</translation> + </message> + <message> + <location filename="Project/Project.py" line="2892"/> <source><b>Open...</b><p>This opens an existing project.</p></source> <translation><b>Ouvrir...</b><p>Ouvre un projet existant.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2894"/> + <location filename="Project/Project.py" line="2899"/> <source>Close project</source> <translation>Fermer le projet</translation> </message> <message> - <location filename="Project/Project.py" line="2894"/> + <location filename="Project/Project.py" line="2899"/> <source>&Close</source> <translation>&Fermer</translation> </message> <message> - <location filename="Project/Project.py" line="2897"/> + <location filename="Project/Project.py" line="2902"/> <source>Close the current project</source> <translation>Fermer le projet en cours</translation> </message> <message> - <location filename="Project/Project.py" line="2898"/> + <location filename="Project/Project.py" line="2903"/> <source><b>Close</b><p>This closes the current project.</p></source> <translation><b>Fermer</b><p>Ferme le projet en cours.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2905"/> + <location filename="Project/Project.py" line="2910"/> <source>Save project</source> <translation>Enregistrer le projet</translation> </message> <message> - <location filename="Project/Project.py" line="2908"/> + <location filename="Project/Project.py" line="2913"/> <source>Save the current project</source> <translation>Enregistre le projet courant</translation> </message> <message> - <location filename="Project/Project.py" line="2909"/> + <location filename="Project/Project.py" line="2914"/> <source><b>Save</b><p>This saves the current project.</p></source> <translation><b>Enregistrer</b><p>Enregistre le projet en cours.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2916"/> + <location filename="Project/Project.py" line="2921"/> <source>Save &as...</source> <translation>&Enregistrer sous...</translation> </message> <message> - <location filename="Project/Project.py" line="2919"/> + <location filename="Project/Project.py" line="2924"/> <source>Save the current project to a new file</source> <translation>Enregistre le projet en cours dans un nouveau fichier</translation> </message> <message> - <location filename="Project/Project.py" line="2920"/> + <location filename="Project/Project.py" line="2925"/> <source><b>Save as</b><p>This saves the current project to a new file.</p></source> <translation><b>Enregistrer sous</b><p>Enregistre le projet en cours dans un nouveau fichier.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2957"/> + <location filename="Project/Project.py" line="2962"/> <source>Add translation to project</source> <translation>Ajouter une traduction au projet</translation> </message> <message> - <location filename="Project/Project.py" line="2957"/> + <location filename="Project/Project.py" line="2962"/> <source>Add &translation...</source> <translation>Ajouter une &traduction...</translation> </message> <message> - <location filename="Project/Project.py" line="2961"/> + <location filename="Project/Project.py" line="2966"/> <source>Add a translation to the current project</source> <translation>Ajoute une traduction au projet en cours</translation> </message> <message> - <location filename="Project/Project.py" line="2963"/> + <location filename="Project/Project.py" line="2968"/> <source><b>Add translation...</b><p>This opens a dialog for add a translation to the current project.</p></source> <translation><b>Ajouter une traduction...</b><p>Ouvre une boite de dialogue pour ajouter une traduction au projet courant.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2971"/> + <location filename="Project/Project.py" line="2976"/> <source>Search new files</source> <translation>Rechercher des nouveaux fichiers</translation> </message> <message> - <location filename="Project/Project.py" line="2971"/> + <location filename="Project/Project.py" line="2976"/> <source>Searc&h new files...</source> <translation>Re&chercher des nouveaux fichiers...</translation> </message> <message> - <location filename="Project/Project.py" line="2974"/> + <location filename="Project/Project.py" line="2979"/> <source>Search new files in the project directory.</source> <translation>Recherche des nouveaux fichiers dans le répertoire du projet.</translation> </message> <message> - <location filename="Project/Project.py" line="2983"/> + <location filename="Project/Project.py" line="2988"/> <source>Project properties</source> <translation>Propriétés du projet</translation> </message> <message> - <location filename="Project/Project.py" line="2983"/> + <location filename="Project/Project.py" line="2988"/> <source>&Properties...</source> <translation>&Propriétés...</translation> </message> <message> - <location filename="Project/Project.py" line="2986"/> + <location filename="Project/Project.py" line="2991"/> <source>Show the project properties</source> <translation>Affiche les propriétés du projet</translation> </message> <message> - <location filename="Project/Project.py" line="2987"/> + <location filename="Project/Project.py" line="2992"/> <source><b>Properties...</b><p>This shows a dialog to edit the project properties.</p></source> <translation><b>Propriétés...</b><p>Affiche une boite de dialogue pour éditer les propriétés du projet.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3095"/> + <location filename="Project/Project.py" line="3100"/> <source>Load session</source> <translation>Charger la session</translation> </message> <message> - <location filename="Project/Project.py" line="3098"/> + <location filename="Project/Project.py" line="3103"/> <source>Load the projects session file.</source> <translation>Charge le fichier de session du projet.</translation> </message> <message> - <location filename="Project/Project.py" line="3099"/> + <location filename="Project/Project.py" line="3104"/> <source><b>Load session</b><p>This loads the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Charger la session</b><p>Charge le fichier session du projet. Une session est constituée par les données suivantes.<br>- tous les fichiers open source<br>- tous les points d'arrêts<br>- les arguments de ligne de commande<br>- le répertoire de travail<br>- le flag de rapport d'exception</p></translation> </message> <message> - <location filename="Project/Project.py" line="3112"/> + <location filename="Project/Project.py" line="3117"/> <source>Save session</source> <translation>Enregistrer la session</translation> </message> <message> - <location filename="Project/Project.py" line="3115"/> + <location filename="Project/Project.py" line="3120"/> <source>Save the projects session file.</source> <translation>Enregistre le fichier de session du projet.</translation> </message> <message> - <location filename="Project/Project.py" line="3116"/> + <location filename="Project/Project.py" line="3121"/> <source><b>Save session</b><p>This saves the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Enregistrer la session</b><p>Enregistrer le fichier session du projet. Une session est constituée par les données suivantes.<br>- tous les fichiers open source<br>- tous les points d'arrêts<br>- les arguments de ligne de commande<br>- le répertoire de travail<br>- le flag de rapport d'exception</p></translation> </message> <message> - <location filename="Project/Project.py" line="3142"/> - <source>Code Metrics</source> - <translation>Statistiques du code</translation> - </message> - <message> - <location filename="Project/Project.py" line="3142"/> - <source>&Code Metrics...</source> - <translation>Statistiques du &Code...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3145"/> - <source>Show some code metrics for the project.</source> - <translation>Affiche des statistiques sur le code du projet.</translation> - </message> - <message> <location filename="Project/Project.py" line="3147"/> + <source>Code Metrics</source> + <translation>Statistiques du code</translation> + </message> + <message> + <location filename="Project/Project.py" line="3147"/> + <source>&Code Metrics...</source> + <translation>Statistiques du &Code...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3150"/> + <source>Show some code metrics for the project.</source> + <translation>Affiche des statistiques sur le code du projet.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3152"/> <source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source> <translation><b>Statistiques du Code...</b><p>Affiche des statistiques sur le code de tous les fichiers Python du projet.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3154"/> + <location filename="Project/Project.py" line="3159"/> <source>Python Code Coverage</source> <translation> Code Coverage Python</translation> </message> <message> - <location filename="Project/Project.py" line="3154"/> - <source>Code Co&verage...</source> - <translation>Code Co&verage...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3157"/> - <source>Show code coverage information for the project.</source> - <translation>Affiche les informations de code coverage pour le projet.</translation> - </message> - <message> <location filename="Project/Project.py" line="3159"/> + <source>Code Co&verage...</source> + <translation>Code Co&verage...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3162"/> + <source>Show code coverage information for the project.</source> + <translation>Affiche les informations de code coverage pour le projet.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3164"/> <source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source> <translation><b>Code Coverage...</b><p>Affiche les informations de code coverage pour le projet.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3839"/> + <location filename="Project/Project.py" line="3844"/> <source>Profile Data</source> <translation>Profiling des données</translation> </message> <message> - <location filename="Project/Project.py" line="3167"/> - <source>&Profile Data...</source> - <translation>&Profiling des données...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3170"/> - <source>Show profiling data for the project.</source> - <translation>Affiche le profiling des données du projet.</translation> - </message> - <message> <location filename="Project/Project.py" line="3172"/> + <source>&Profile Data...</source> + <translation>&Profiling des données...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3175"/> + <source>Show profiling data for the project.</source> + <translation>Affiche le profiling des données du projet.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3177"/> <source><b>Profile Data...</b><p>This shows the profiling data for the project.</p></source> <translation><b>Profilling des données...</b><p>Affiche le profiling des données du projet.</p></translation> </message> @@ -29509,77 +29562,77 @@ <translation type="obsolete"><b>Supprimer Cyclops le rapport Cyclops</b><p>Supprime le rapport Cyclops du projet.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3892"/> + <location filename="Project/Project.py" line="3897"/> <source>Application Diagram</source> <translation>Diagramme de l'application</translation> </message> <message> - <location filename="Project/Project.py" line="3179"/> - <source>&Application Diagram...</source> - <translation>&Diagramme de l'application...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3182"/> - <source>Show a diagram of the project.</source> - <translation>Affiche le diagramme de l'application.</translation> - </message> - <message> <location filename="Project/Project.py" line="3184"/> + <source>&Application Diagram...</source> + <translation>&Diagramme de l'application...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3187"/> + <source>Show a diagram of the project.</source> + <translation>Affiche le diagramme de l'application.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3189"/> <source><b>Application Diagram...</b><p>This shows a diagram of the project.</p></source> <translation><b>Diagramme de l'application...</b><p>Affiche le diagramme du projet.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3257"/> + <location filename="Project/Project.py" line="3262"/> <source>Open &Recent Projects</source> <translation>Ouvrir un projet &récent</translation> </message> <message> - <location filename="Project/Project.py" line="3264"/> + <location filename="Project/Project.py" line="3269"/> <source>&Diagrams</source> <translation>&Diagrammes</translation> </message> <message> - <location filename="Project/Project.py" line="3261"/> + <location filename="Project/Project.py" line="3266"/> <source>Chec&k</source> <translation>&Vérification</translation> </message> <message> - <location filename="Project/Project.py" line="3258"/> - <source>&Version Control</source> - <translation>&Contrôle de version</translation> - </message> - <message> <location filename="Project/Project.py" line="3263"/> + <source>&Version Control</source> + <translation>&Contrôle de version</translation> + </message> + <message> + <location filename="Project/Project.py" line="3268"/> <source>Sho&w</source> <translation>&Affichage</translation> </message> <message> - <location filename="Project/Project.py" line="3266"/> + <location filename="Project/Project.py" line="3271"/> <source>Source &Documentation</source> <translation>&Documentation automatique</translation> </message> <message> - <location filename="Project/Project.py" line="3542"/> + <location filename="Project/Project.py" line="3547"/> <source>Search New Files</source> <translation>Rechercher des nouveaux fichiers</translation> </message> <message> - <location filename="Project/Project.py" line="3542"/> + <location filename="Project/Project.py" line="3547"/> <source>There were no new files found to be added.</source> <translation>Aucun fichier à ajouter n'a été trouvé.</translation> </message> <message> - <location filename="Project/Project.py" line="3680"/> + <location filename="Project/Project.py" line="3685"/> <source>Version Control System</source> <translation>Système de conrôle des versions (VCS)</translation> </message> <message> - <location filename="Project/Project.py" line="3772"/> + <location filename="Project/Project.py" line="3777"/> <source>Coverage Data</source> <translation>Coverage de données</translation> </message> <message> - <location filename="Project/Project.py" line="3818"/> + <location filename="Project/Project.py" line="3823"/> <source>There is no main script defined for the current project. Aborting</source> <translation>Il n'y a pas de script principal défini dans le projet en cours. Abandon</translation> </message> @@ -29619,37 +29672,37 @@ <translation>Sélectionner un système de contrôle de version (VCS) pour le projet</translation> </message> <message> - <location filename="Project/Project.py" line="2943"/> + <location filename="Project/Project.py" line="2948"/> <source>Add directory to project</source> <translation>Ajouter un répertoire au projet</translation> </message> <message> - <location filename="Project/Project.py" line="2943"/> + <location filename="Project/Project.py" line="2948"/> <source>Add directory...</source> <translation>Ajouter un répertoire...</translation> </message> <message> - <location filename="Project/Project.py" line="2947"/> + <location filename="Project/Project.py" line="2952"/> <source>Add a directory to the current project</source> <translation>Ajouter un répertoire au projet courant</translation> </message> <message> - <location filename="Project/Project.py" line="2949"/> + <location filename="Project/Project.py" line="2954"/> <source><b>Add directory...</b><p>This opens a dialog for adding a directory to the current project.</p></source> <translation><b>Ajouter un répertoire...</b><p>Ouvre une fenêtre pour ajouter un répertoire au projet courant.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3793"/> + <location filename="Project/Project.py" line="3798"/> <source>Code Coverage</source> <translation>Code Coverage</translation> </message> <message> - <location filename="Project/Project.py" line="3793"/> + <location filename="Project/Project.py" line="3798"/> <source>Please select a coverage file</source> <translation>Sélectionner un fichier coverage</translation> </message> <message> - <location filename="Project/Project.py" line="3839"/> + <location filename="Project/Project.py" line="3844"/> <source>Please select a profile file</source> <translation>Sélectionner un fichier profile</translation> </message> @@ -29749,17 +29802,17 @@ <translation type="obsolete"><p>Impossible de supprimer le fichier session de projet <b>%1</b>.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3129"/> + <location filename="Project/Project.py" line="3134"/> <source>Delete session</source> <translation>Supprimer la session</translation> </message> <message> - <location filename="Project/Project.py" line="3132"/> + <location filename="Project/Project.py" line="3137"/> <source>Delete the projects session file.</source> <translation>Suppression du fichier session de projet.</translation> </message> <message> - <location filename="Project/Project.py" line="3133"/> + <location filename="Project/Project.py" line="3138"/> <source><b>Delete session</b><p>This deletes the projects session file</p></source> <translation><b>Suppression de session</b><p>Ceci supprime le fichier session de projet.</p></translation> </message> @@ -29769,7 +29822,7 @@ <translation>Fichiers Ruby (*.rb);;</translation> </message> <message> - <location filename="Project/Project.py" line="2975"/> + <location filename="Project/Project.py" line="2980"/> <source><b>Search new files...</b><p>This searches for new files (sources, *.ui, *.idl) in the project directory and registered subdirectories.</p></source> <translation><b>Chercher des nouveaux fichiers...</b><p>Cette commande recherche des nouveaux fichiers (sources, *.ui, *.idl) dans le répertoire projet et dans les sous-répertoires enregistrés.</p></translation> </message> @@ -29784,7 +29837,7 @@ <translation>Autre</translation> </message> <message> - <location filename="Project/Project.py" line="3892"/> + <location filename="Project/Project.py" line="3897"/> <source>Include module names?</source> <translation>Inclure les noms de modules ?</translation> </message> @@ -29869,132 +29922,132 @@ <translation type="obsolete"><p>Impossible de supprimer le fichier de propriétés du débogueur : <b>%1</b></p></translation> </message> <message> - <location filename="Project/Project.py" line="3037"/> + <location filename="Project/Project.py" line="3042"/> <source>Debugger Properties</source> <translation>Propriétés du Débogueur</translation> </message> <message> - <location filename="Project/Project.py" line="3037"/> + <location filename="Project/Project.py" line="3042"/> <source>Debugger &Properties...</source> <translation>Débogueur & Propriétés...</translation> </message> <message> - <location filename="Project/Project.py" line="3040"/> + <location filename="Project/Project.py" line="3045"/> <source>Show the debugger properties</source> <translation>Affichage des propriétés du débogueur</translation> </message> <message> - <location filename="Project/Project.py" line="3041"/> + <location filename="Project/Project.py" line="3046"/> <source><b>Debugger Properties...</b><p>This shows a dialog to edit project specific debugger settings.</p></source> <translation><b>Propriétés du Débogueur...</b><p>Affiche une boite de dialogue permettant d'éditer les proprités du débogueur, spécifiques au projet.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3048"/> + <location filename="Project/Project.py" line="3053"/> <source>Load</source> <translation>Charger</translation> </message> <message> - <location filename="Project/Project.py" line="3048"/> + <location filename="Project/Project.py" line="3053"/> <source>&Load</source> <translation>&Charger</translation> </message> <message> - <location filename="Project/Project.py" line="3051"/> + <location filename="Project/Project.py" line="3056"/> <source>Load the debugger properties</source> <translation>Charger les propriétés du débogueur</translation> </message> <message> - <location filename="Project/Project.py" line="3059"/> + <location filename="Project/Project.py" line="3064"/> <source>Save</source> <translation>Enregistrer</translation> </message> <message> - <location filename="Project/Project.py" line="3062"/> + <location filename="Project/Project.py" line="3067"/> <source>Save the debugger properties</source> <translation>Enregistrer les propriétés du débogueur</translation> </message> <message> - <location filename="Project/Project.py" line="3070"/> + <location filename="Project/Project.py" line="3075"/> <source>Delete</source> <translation>Supprimer</translation> </message> <message> - <location filename="Project/Project.py" line="3070"/> + <location filename="Project/Project.py" line="3075"/> <source>&Delete</source> <translation>&Supprimer</translation> </message> <message> - <location filename="Project/Project.py" line="3073"/> + <location filename="Project/Project.py" line="3078"/> <source>Delete the debugger properties</source> <translation>Supprimer les propriétés du débogueur</translation> </message> <message> - <location filename="Project/Project.py" line="3082"/> + <location filename="Project/Project.py" line="3087"/> <source>Reset</source> <translation>Réinitialiser</translation> </message> <message> - <location filename="Project/Project.py" line="3082"/> + <location filename="Project/Project.py" line="3087"/> <source>&Reset</source> <translation>&Réinitialiser</translation> </message> <message> - <location filename="Project/Project.py" line="3085"/> + <location filename="Project/Project.py" line="3090"/> <source>Reset the debugger properties</source> <translation>Réinitialise des propriétés du débogueur</translation> </message> <message> - <location filename="Project/Project.py" line="3268"/> + <location filename="Project/Project.py" line="3273"/> <source>Debugger</source> <translation>Débogueur</translation> </message> <message> - <location filename="Project/Project.py" line="3265"/> + <location filename="Project/Project.py" line="3270"/> <source>Session</source> <translation>Session</translation> </message> <message> - <location filename="Project/Project.py" line="3052"/> + <location filename="Project/Project.py" line="3057"/> <source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source> <translation><b>Chargement des Propriétés du Débogueur</b><p>Charge la configuration du débogueur spécifique au projet.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3063"/> + <location filename="Project/Project.py" line="3068"/> <source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source> <translation><b>Enregistrement des Propriétés du Débogueur</b><p>Enregistre la configuration du débogueur spécifique au projet.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3074"/> + <location filename="Project/Project.py" line="3079"/> <source><b>Delete Debugger Properties</b><p>This deletes the file containing the project specific debugger settings.</p></source> <translation><b>Suppression des Propriétés du Débogueur...</b><p>Supprime la configuration du débogueur spécifique au projet.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3086"/> + <location filename="Project/Project.py" line="3091"/> <source><b>Reset Debugger Properties</b><p>This resets the project specific debugger settings.</p></source> <translation><b>Réinitialiser les propriétés du débogueur</b><p>Réinitialise la configuration du débogueur spécifique au projet.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3006"/> - <source>Filetype Associations</source> - <translation>Association des types de fichiers</translation> - </message> - <message> - <location filename="Project/Project.py" line="3006"/> - <source>Filetype Associations...</source> - <translation>Association des types de fichiers...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3009"/> - <source>Show the project filetype associations</source> - <translation>Affiche les asociation Fichier/Type de fichier pour le projet</translation> - </message> - <message> <location filename="Project/Project.py" line="3011"/> + <source>Filetype Associations</source> + <translation>Association des types de fichiers</translation> + </message> + <message> + <location filename="Project/Project.py" line="3011"/> + <source>Filetype Associations...</source> + <translation>Association des types de fichiers...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3014"/> + <source>Show the project filetype associations</source> + <translation>Affiche les asociation Fichier/Type de fichier pour le projet</translation> + </message> + <message> + <location filename="Project/Project.py" line="3016"/> <source><b>Filetype Associations...</b><p>This shows a dialog to edit the filetype associations of the project. These associations determine the type (source, form, interface or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.</p></source> <translation><b>Filetype Associations...</b><p>This shows a dialog to edit the filetype associations of the project. These associations determine the type (source, form, interface or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3269"/> + <location filename="Project/Project.py" line="3274"/> <source>Pac&kagers</source> <translation>Création de pac&kage</translation> </message> @@ -30004,22 +30057,22 @@ <translation type="obsolete">Problème de sécurité</translation> </message> <message> - <location filename="Project/Project.py" line="2929"/> + <location filename="Project/Project.py" line="2934"/> <source>Add files to project</source> <translation>Ajouter des fichiers au projet</translation> </message> <message> - <location filename="Project/Project.py" line="2929"/> - <source>Add &files...</source> - <translation>Ajouter des &fichiers...</translation> - </message> - <message> - <location filename="Project/Project.py" line="2933"/> - <source>Add files to the current project</source> - <translation>Ajouter des fichiers au projet courant</translation> - </message> - <message> <location filename="Project/Project.py" line="2934"/> + <source>Add &files...</source> + <translation>Ajouter des &fichiers...</translation> + </message> + <message> + <location filename="Project/Project.py" line="2938"/> + <source>Add files to the current project</source> + <translation>Ajouter des fichiers au projet courant</translation> + </message> + <message> + <location filename="Project/Project.py" line="2939"/> <source><b>Add files...</b><p>This opens a dialog for adding files to the current project. The place to add is determined by the file extension.</p></source> <translation><b>Ajouter des fichiers...</b><p>Ouvre une boite de dialogue pour ajouter des fichiers au projet courant. La position pour l'insertion est déterminée par l'extension du fichier.</p></translation> </message> @@ -30074,17 +30127,17 @@ <translation type="obsolete">Fichiers projets (*.e4p);;Fichiers projets compressés (*.e4pz)</translation> </message> <message> - <location filename="Project/Project.py" line="3256"/> + <location filename="Project/Project.py" line="3261"/> <source>&Project</source> <translation>&Projet</translation> </message> <message> - <location filename="Project/Project.py" line="3371"/> + <location filename="Project/Project.py" line="3376"/> <source>Project</source> <translation>Projet</translation> </message> <message> - <location filename="Project/Project.py" line="3432"/> + <location filename="Project/Project.py" line="3437"/> <source>&Clear</source> <translation>&Effacer</translation> </message> @@ -30114,22 +30167,22 @@ <translation type="obsolete"><p>Impossible d'écrire le fichier de propriétés du projet <b>%1</b>.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2994"/> + <location filename="Project/Project.py" line="2999"/> <source>User project properties</source> <translation>Propriétés utilisateur du projet</translation> </message> <message> - <location filename="Project/Project.py" line="2994"/> - <source>&User Properties...</source> - <translation>Propriétés &Utilisateur...</translation> - </message> - <message> - <location filename="Project/Project.py" line="2997"/> - <source>Show the user specific project properties</source> - <translation>Afficher le propriétés utilisateurs spécifiques au projet</translation> - </message> - <message> <location filename="Project/Project.py" line="2999"/> + <source>&User Properties...</source> + <translation>Propriétés &Utilisateur...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3002"/> + <source>Show the user specific project properties</source> + <translation>Afficher le propriétés utilisateurs spécifiques au projet</translation> + </message> + <message> + <location filename="Project/Project.py" line="3004"/> <source><b>User Properties...</b><p>This shows a dialog to edit the user specific project properties.</p></source> <translation><b>Propriétés utilisateur...</b><p>Affiche une fenêtre permettant d'éditer les propriétés du projet spécifiques à l'utilisateur.</p></translation> </message> @@ -30157,12 +30210,12 @@ <translation type="obsolete">Plugin Eric4</translation> </message> <message> - <location filename="Project/Project.py" line="4023"/> + <location filename="Project/Project.py" line="4028"/> <source>Create Package List</source> <translation>Création de la liste de package</translation> </message> <message> - <location filename="Project/Project.py" line="3193"/> + <location filename="Project/Project.py" line="3198"/> <source>Create &Package List</source> <translation>Création de la liste de &package</translation> </message> @@ -30177,12 +30230,12 @@ <translation type="obsolete"><b>Création de la liste de package</b><p>Cette commande créé la liste des fichiers à inclure dans l'archive d'un plugin eric4. Cette liste est créée à partir du fichier projet.</p></translation> </message> <message> - <location filename="Project/Project.py" line="4183"/> + <location filename="Project/Project.py" line="4188"/> <source>Create Plugin Archive</source> <translation>Création de l'archive du plugin</translation> </message> <message> - <location filename="Project/Project.py" line="3207"/> + <location filename="Project/Project.py" line="3212"/> <source>Create Plugin &Archive</source> <translation>Création de l'&archive du plugin</translation> </message> @@ -30192,7 +30245,7 @@ <translation type="obsolete">Créé le fichier d'archive pour un plugin eric4.</translation> </message> <message> - <location filename="Project/Project.py" line="3996"/> + <location filename="Project/Project.py" line="4001"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation><p>Le fichier <b>PKGLIST</b> existe déjà.</p><p>Ecraser ?</p></translation> </message> @@ -30202,12 +30255,12 @@ <translation type="obsolete"><p>Impossible de créer le fichier <b>PKGLIST</b>.</p><p>Raison: %1</p></translation> </message> <message> - <location filename="Project/Project.py" line="4040"/> + <location filename="Project/Project.py" line="4045"/> <source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source> <translation><p>Le fichier <b>PKGLIST</b> n'existe pas. Abandon...</p></translation> </message> <message> - <location filename="Project/Project.py" line="4048"/> + <location filename="Project/Project.py" line="4053"/> <source>The project does not have a main script defined. Aborting...</source> <translation>Le projet n'a pas de script principal défini. Abandon...</translation> </message> @@ -30262,12 +30315,12 @@ <translation type="obsolete"><p>Impossible d'enregistrer le fichier <b>%1</b> dans l'archive. Plugin ignoré.</p><p>Raison: %2</p></translation> </message> <message> - <location filename="Project/Project.py" line="3222"/> + <location filename="Project/Project.py" line="3227"/> <source>Create Plugin Archive (Snapshot)</source> <translation>Création d'une archive plugin (Snapshot)</translation> </message> <message> - <location filename="Project/Project.py" line="3222"/> + <location filename="Project/Project.py" line="3227"/> <source>Create Plugin Archive (&Snapshot)</source> <translation>Création d'une archive plugin (&Snapshot)</translation> </message> @@ -30317,22 +30370,22 @@ <translation type="obsolete"><p>Le VCS sélectionné (<b>%1</b>) est introuvable.<br>Désactivation du système de contrôle de versions (VCS).</p><p>%2</p></translation> </message> <message> - <location filename="Project/Project.py" line="3021"/> + <location filename="Project/Project.py" line="3026"/> <source>Lexer Associations</source> <translation>Association des types de fichiers</translation> </message> <message> - <location filename="Project/Project.py" line="3021"/> - <source>Lexer Associations...</source> - <translation>Association des types de fichiers...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3024"/> - <source>Show the project lexer associations (overriding defaults)</source> - <translation>Affiche les asociations Fichier/Type de fichier pour le projet (sans tenir compte des valeurs par défaut)</translation> - </message> - <message> <location filename="Project/Project.py" line="3026"/> + <source>Lexer Associations...</source> + <translation>Association des types de fichiers...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3029"/> + <source>Show the project lexer associations (overriding defaults)</source> + <translation>Affiche les asociations Fichier/Type de fichier pour le projet (sans tenir compte des valeurs par défaut)</translation> + </message> + <message> + <location filename="Project/Project.py" line="3031"/> <source><b>Lexer Associations...</b><p>This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.</p></source> <translation><b>Associations des types de fichiers...</b><p>Permet d'associer les types de fichiers aux analyseurs syntaxiques pour le projet en cours. Ces associations sont prioritaires sur les associations de fichiers configurées par défaut.</p></translation> </message> @@ -30462,72 +30515,72 @@ <translation type="obsolete">Fichiers projets (*.e4p *.e4pz)</translation> </message> <message> - <location filename="Project/Project.py" line="3197"/> + <location filename="Project/Project.py" line="3202"/> <source>Create an initial PKGLIST file for an eric5 plugin.</source> <translation type="unfinished">Créé un fichier PKGLIST initial pour un plugin eric4. {5 ?}</translation> </message> <message> - <location filename="Project/Project.py" line="3199"/> + <location filename="Project/Project.py" line="3204"/> <source><b>Create Package List</b><p>This creates an initial list of files to include in an eric5 plugin archive. The list is created from the project file.</p></source> <translation type="unfinished"><b>Création de la liste de package</b><p>Cette commande créé la liste des fichiers à inclure dans l'archive d'un plugin eric4. Cette liste est créée à partir du fichier projet.</p> {5 ?}</translation> </message> <message> - <location filename="Project/Project.py" line="3211"/> + <location filename="Project/Project.py" line="3216"/> <source>Create an eric5 plugin archive file.</source> <translation type="unfinished">Créé le fichier d'archive pour un plugin eric4. {5 ?}</translation> </message> <message> - <location filename="Project/Project.py" line="3213"/> + <location filename="Project/Project.py" line="3218"/> <source><b>Create Plugin Archive</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name.</p></source> <translation type="unfinished"><b>Création de l'archive du plugin</b><p>Ceci créé une archive contenant l'ensemble des fichiers indiqués dans le fichier PKGLIST. Le nom de l'archive est construit à partir du nom du script principal.</p> {5 ?}</translation> </message> <message> - <location filename="Project/Project.py" line="3226"/> + <location filename="Project/Project.py" line="3231"/> <source>Create an eric5 plugin archive file (snapshot release).</source> <translation type="unfinished">Créé une archive de plugin eric4 (snapshot release). {5 ?}</translation> </message> <message> - <location filename="Project/Project.py" line="3228"/> + <location filename="Project/Project.py" line="3233"/> <source><b>Create Plugin Archive (Snapshot)</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name. The version entry of the main script is modified to reflect a snapshot release.</p></source> <translation type="unfinished"><b>Création d'une archive de plugin (Snapshot)</b><p>Ceci permet de créer un plugin en utilisant la liste des fichiers indiqués dans le fichier PKGLIST. Le nom de l'archive est créé à partir du nom du script principal. Le champ 'version' du script principal est modifié pour indiquer une version snapshot.</p> {5 ?}</translation> </message> <message> - <location filename="Project/Project.py" line="3671"/> + <location filename="Project/Project.py" line="3676"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Reverting override.</p><p>{1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3680"/> + <location filename="Project/Project.py" line="3685"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Disabling version control.</p><p>{1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4023"/> + <location filename="Project/Project.py" line="4028"/> <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4060"/> + <location filename="Project/Project.py" line="4065"/> <source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4071"/> + <location filename="Project/Project.py" line="4076"/> <source><p>The eric5 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4091"/> + <location filename="Project/Project.py" line="4096"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4103"/> + <location filename="Project/Project.py" line="4108"/> <source><p>The eric5 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4183"/> + <location filename="Project/Project.py" line="4188"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -32373,22 +32426,22 @@ <context> <name>Purge</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="91"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="97"/> <source>Purge All Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="98"/> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="101"/> <source>Purge Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="102"/> <source>Do really want to delete files not tracked by Mercurial?</source> <translation type="unfinished"></translation> </message> @@ -34601,177 +34654,177 @@ <context> <name>Queues</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="256"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="276"/> <source>New Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="325"/> <source>Update Current Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="356"/> - <source>Pop Patches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="360"/> - <source>Push Patches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="364"/> - <source>Go to Patch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> - <source>Select Patch</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="376"/> + <source>Pop Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="380"/> + <source>Push Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="384"/> + <source>Go to Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="515"/> + <source>Select Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="396"/> <source>Select the target patch name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="515"/> <source>No patches to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="447"/> <source>Finish Applied Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="459"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="479"/> <source>Rename Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="501"/> <source>Select the patch to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="490"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="510"/> <source>Delete Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="535"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="555"/> <source>Fold Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="551"/> <source>No patches selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="535"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="555"/> <source>No patches available to be folded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="559"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="579"/> <source>List Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="559"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="579"/> <source>No patches available to list guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="594"/> - <source>Define Guards</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> - <source>No patches available to define guards for.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> - <source>Drop All Guards</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="614"/> + <source>Define Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <source>No patches available to define guards for.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <source>Drop All Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="634"/> <source>Select the patch to drop guards for (leave empty for the current patch):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="693"/> <source>Set Active Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="693"/> <source>No guards available to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="691"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="715"/> <source>Deactivate Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="753"/> <source>Create New Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="755"/> <source>Rename Active Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="757"/> - <source>Error while creating a new queue.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/> - <source>Error while renaming the active queue.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="787"/> - <source>Purge Queue</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="789"/> + <source>Error while creating a new queue.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="792"/> + <source>Error while renaming the active queue.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="819"/> + <source>Purge Queue</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="821"/> <source>Delete Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="823"/> <source>Activate Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="820"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="860"/> <source>Error while purging the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="862"/> <source>Error while deleting the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="864"/> <source>Error while setting the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="847"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="887"/> <source>Available Queues</source> <translation type="unfinished"></translation> </message> @@ -53341,30 +53394,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1168"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1668"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1676"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1116"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1184"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1214"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -53375,23 +53428,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1566"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1662"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1680"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1683"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -53399,7 +53452,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Wed Aug 31 19:28:49 2011 +0200 +++ b/i18n/eric5_it.ts Wed Aug 31 19:35:11 2011 +0200 @@ -1380,62 +1380,62 @@ <context> <name>Bookmarks</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="129"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="147"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="147"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="159"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="187"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="220"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="304"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="304"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="316"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="337"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="337"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="334"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="349"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -15380,250 +15380,270 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> <source>The hg process finished with the exit code {0}</source> <translation>Il processo hg è terminato con codice di uscita {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="234"/> <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/hg.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>Could not start the hg executable.</source> <translation>Non posso avviare l'eseguibile hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> <source>Create project repository</source> <translation>Crea il repository del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> <source>The project repository could not be created.</source> <translation>Il repository del progetto non può essere creato.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> - <source>Creating Mercurial repository</source> - <translation>Creazione repository Mercurial</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> + <source>Creating Mercurial repository</source> + <translation>Creazione repository Mercurial</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> <source>Initial commit to Mercurial repository</source> <translation>Commit iniziale nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="331"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="351"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonazione del progetto dal repository Mercurial</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="427"/> <source>Commiting changes to Mercurial repository</source> - <translation>Commit delle modifiche nel repository Mercurial</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="475"/> + <translation type="obsolete">Commit delle modifiche nel repository Mercurial</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizzazione con il repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="523"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="558"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Aggiunta di file/directory al repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="622"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Rimozione di file/directory dal repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="686"/> <source>Renaming {0}</source> <translation>Rinomino {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="746"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="791"/> <source>Taging in the Mercurial repository</source> <translation>Creazione tag nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="776"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/> <source>Reverting changes</source> <translation>Annullamento modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="869"/> <source>Merging</source> <translation>Merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1047"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> <source>Mercurial command</source> <translation>Comando Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1224"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1298"/> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> <source>Select number of entries to show.</source> <translation>Mostra il numero di elementi da mostrare.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1477"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> <source>Pulling from a remote Mercurial repository</source> <translation>Pulling da un repository Mercurial remoto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1509"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1599"/> <source>Pushing to a remote Mercurial repository</source> <translation>Pushing in un repository Mercurial remoto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source>Resolving files/directories</source> <translation>Risoluzione di file/directory</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source>Create Branch</source> <translation>Creazione Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source>Enter branch name</source> <translation>Inserisci il nome del Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1656"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> <source>Creating branch in the Mercurial repository</source> <translation>Creazione Branch nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1736"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verifica dell'integrità del repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1856"/> <source>Showing the combined configuration settings</source> <translation>Visualizzazione combinata della impostazioni di configurazione</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <source>Showing aliases for remote repositories</source> <translation>Visualizzazione degli alias per i repository remoti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> <source>Shall the working directory be updated?</source> <translation>Le directory di lavoro devono essere aggiornate ?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1679"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation>Sottocomando Bisect ({0}) non valido.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> - <source>Mercurial Bisect ({0})</source> - <translation>Mercurial Bisect ({0})</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> - <source>Preview changegroup</source> - <translation>Anteprima changegroup</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> - <source>Identifying project directory</source> - <translation>Identificazione directory del progetto</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> - <source>Create .hgignore file</source> - <translation>Crea il file .hgignore</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> - <source>Removing files from the Mercurial repository only</source> - <translation>Rimozione di file dal solo repository Mercurial</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation>Mercurial Changegroup Files (*.hg)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> - <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> - <translation>Mercurial Changegroup Files (*.hg);;All Files (*)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2006"/> - <source>Identifying changegroup file</source> - <translation>Identifica i file changegroup</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> - <source>Backing out changeset</source> - <translation>Ritiro changeset</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation>Sottocomando Bisect ({0}) non valido.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <source>Mercurial Bisect ({0})</source> + <translation>Mercurial Bisect ({0})</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2098"/> + <source>Preview changegroup</source> + <translation>Anteprima changegroup</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <source>Identifying project directory</source> + <translation>Identificazione directory del progetto</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <source>Create .hgignore file</source> + <translation>Crea il file .hgignore</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2225"/> + <source>Removing files from the Mercurial repository only</source> + <translation>Rimozione di file dal solo repository Mercurial</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation>Mercurial Changegroup Files (*.hg)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> + <translation>Mercurial Changegroup Files (*.hg);;All Files (*)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2108"/> + <source>Identifying changegroup file</source> + <translation>Identifica i file changegroup</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2281"/> + <source>Backing out changeset</source> + <translation>Ritiro changeset</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2024"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file changegroup di Mercurial<b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2306"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="454"/> + <source>Committing changes to Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <source>Mercurial Command Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2344"/> + <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -15703,12 +15723,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="110"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="110"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <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> @@ -16081,17 +16101,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> <source>Process Generation Error</source> <translation type="unfinished">Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="165"/> <source>no bookmarks found</source> <translation type="unfinished"></translation> </message> @@ -16181,17 +16201,17 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> <source>Process Generation Error</source> <translation type="unfinished">Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="150"/> <source>no bookmarks defined</source> <translation type="unfinished"></translation> </message> @@ -16310,6 +16330,44 @@ </message> </context> <context> + <name>HgClient</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="76"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="117"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="119"/> + <source>Received data on unexpected channel.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="124"/> + <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="128"/> + <source>'capabilities' message did not contain any capability.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="136"/> + <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <source>'encoding' message did not contain any encoding.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/> @@ -16526,12 +16584,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> <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> @@ -16599,42 +16657,42 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/> <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/HgDiffDialog.py" line="178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="206"/> <source>There is no difference.</source> <translation>Non ci sono differenze.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="347"/> <source>Save Diff</source> <translation>Salva Diff</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="316"/> <source>Patch Files (*.diff)</source> <translation>File Patch (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="347"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Il file <b>{0}</b> non può essere salvato.<br />Motivo: {1}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="289"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="333"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file patch <b>{0}</b> esiste già.Sovrascriverlo ?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="109"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="112"/> <source>Patch Contents</source> <translation type="unfinished"></translation> </message> @@ -16833,7 +16891,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="310"/> <source>Revision</source> <translation type="unfinished">Revisione</translation> </message> @@ -16908,17 +16966,17 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> <source>Process Generation Error</source> <translation type="unfinished">Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="147"/> <source>no signatures found</source> <translation type="unfinished"></translation> </message> @@ -16956,17 +17014,17 @@ <translation>Seleziona il campo su cui filtrare</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1082"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/> <source>Revision</source> <translation>Revisione</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1079"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1128"/> <source>Author</source> <translation>Autore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> <source>Message</source> <translation>Messaggio</translation> </message> @@ -17091,42 +17149,42 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> <source>Added</source> <translation>Aggiunto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="116"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Deleted</source> <translation>Cancellato</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> <source>Modified</source> <translation>Modificato</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> <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="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489"/> <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="473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="492"/> <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="476"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> <source>Mercurial Error</source> <translation>Mercurial Error</translation> </message> @@ -17166,7 +17224,7 @@ <translation>Seleziona il branch su cui filtrare</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/> <source>All</source> <translation>Tutti</translation> </message> @@ -17181,7 +17239,7 @@ <translation>Mercurial Log (Outgoing)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> <source>Bookmarks</source> <translation type="unfinished">Segnalibri</translation> </message> @@ -17264,115 +17322,115 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="55"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="56"/> <source><b>Processing your request, please wait...</b></source> <translation><b>Esecuzione in corso, attendere prego...</b></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="66"/> <source>Revision</source> <translation>Revisione</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> <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/HgLogDialog.py" line="225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="259"/> <source>No log available for '{0}'</source> <translation>Nessun log disponibile per '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> <source>diff to {0}</source> <translation>diff su {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> <source>Branches: {0}<br /> </source> <translation>Branches: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="302"/> <source>Tags: {0}<br /> </source> <translation>Tags: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/> <source>Parents: {0}<br /> </source> <translation>Parents: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Autore: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="278"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Data: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> <source>Added {0}<br /> </source> <translation>Aggiunti: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> <source>Modified {0}<br /> </source> <translation>Modificati {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="338"/> <source>Deleted {0}<br /> </source> <translation>Cancellati {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="201"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="226"/> <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/HgLogDialog.py" line="203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="228"/> <source>Could not start the hg executable.</source> <translation>Non posso avviare l'eseguibile hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="231"/> <source>Mercurial Error</source> <translation>Mercurial Error</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="288"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Aggiunti {0} (copiati da {1})<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="271"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> @@ -18863,37 +18921,37 @@ <translation type="unfinished">Rimuovi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> <source>Unsaved Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> <source>Remove Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> <source>Do you really want to remove the selected guards?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> <source>Apply Guard Definitions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/> <source>The Mercurial process did not finish in time.</source> <translation type="unfinished"></translation> </message> @@ -18967,17 +19025,17 @@ <translation type="unfinished">Messaggio di commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> <source>Process Generation Error</source> <translation type="unfinished">Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="189"/> <source>Error: </source> <translation type="unfinished"></translation> </message> @@ -18995,12 +19053,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="89"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="103"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="94"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> @@ -19085,42 +19143,42 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> <source>Process Generation Error</source> <translation type="unfinished">Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="219"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="50"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> <source>applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> - <source>guarded</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="53"/> + <source>guarded</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="54"/> <source>missing</source> <translation type="unfinished">mancante</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="292"/> <source>unknown</source> <translation type="unfinished">sconosciuto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> <source>not applied</source> <translation type="unfinished"></translation> </message> @@ -19158,7 +19216,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="111"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="122"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> @@ -19274,12 +19332,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="60"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="62"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="62"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="64"/> <source>Press to refresh the queues list</source> <translation type="unfinished"></translation> </message> @@ -19787,7 +19845,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="188"/> <source>Mercurial Status</source> <translation>Mercurial Status</translation> </message> @@ -19864,107 +19922,107 @@ <translation>Premi per aggiornare lo stato</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="62"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="63"/> <source>Commit changes to repository...</source> <translation>Committa le modifica nel repository...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/> <source>Add to repository</source> <translation>Aggiungi al repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="71"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="72"/> <source>Revert changes</source> <translation>Annulla modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="76"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="77"/> <source>Adjust column sizes</source> <translation>Adatta dimensione colonne</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>added</source> <translation>aggiunto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> - <source>modified</source> - <translation>modificato</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> - <source>removed</source> - <translation>rimosso</translation> + <source>modified</source> + <translation>modificato</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> - <source>not tracked</source> - <translation>non tracciato</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> - <source>normal</source> - <translation>normale</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> - <source>ignored</source> - <translation>ignorato</translation> + <source>removed</source> + <translation>rimosso</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> + <source>not tracked</source> + <translation>non tracciato</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> + <source>normal</source> + <translation>normale</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> + <source>ignored</source> + <translation>ignorato</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> <source>missing</source> <translation>mancante</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="238"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="238"/> <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/HgStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="540"/> <source>Commit</source> <translation>Commit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="642"/> <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="529"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="567"/> <source>Add</source> <translation>Aggiungi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="567"/> <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="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="625"/> <source>Revert</source> <translation>Inverti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="69"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="70"/> <source>Remove from repository</source> <translation>Rimuovi dal repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="588"/> <source>Remove</source> <translation>Rimuovi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="625"/> <source>There are no missing entries available/selected.</source> <translation>Non ci sono elementi mancati disponibili/selezionati.</translation> </message> @@ -20039,27 +20097,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="68"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="74"/> <source>Restore missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="452"/> <source>all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="540"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="642"/> <source>Differences</source> <translation type="unfinished"></translation> </message> @@ -20067,12 +20125,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="153"/> <source>Mercurial status checked successfully</source> <translation>Stato Mercurial controllato con successo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="119"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="100"/> <source>Could not start the Mercurial process.</source> <translation>Non posso avviare il processo Mercurial.</translation> </message> @@ -20164,32 +20222,32 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="86"/> <source>Mercurial Branches List</source> <translation>Mercurial Branches List</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="87"/> <source>Status</source> <translation>Stato</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> <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/HgTagBranchListDialog.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="247"/> <source>active</source> <translation>attivo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="252"/> <source>yes</source> <translation>si</translation> </message> @@ -27072,17 +27130,17 @@ <translation>Crea la directory del progetto</translation> </message> <message> - <location filename="Project/Project.py" line="2869"/> + <location filename="Project/Project.py" line="2874"/> <source>New project</source> <translation>Nuovo progetto</translation> </message> <message> - <location filename="Project/Project.py" line="2882"/> + <location filename="Project/Project.py" line="2887"/> <source>Open project</source> <translation>Apri progetto</translation> </message> <message> - <location filename="Project/Project.py" line="2916"/> + <location filename="Project/Project.py" line="2921"/> <source>Save project as</source> <translation>Salva progetto come</translation> </message> @@ -27102,307 +27160,307 @@ <translation>Il progetto attuale ha delle modifiche non salvate.</translation> </message> <message> - <location filename="Project/Project.py" line="3059"/> + <location filename="Project/Project.py" line="3064"/> <source>&Save</source> <translation>&Salva</translation> </message> <message> - <location filename="Project/Project.py" line="2869"/> - <source>&New...</source> - <translation>&Nuovo...</translation> - </message> - <message> - <location filename="Project/Project.py" line="2873"/> - <source>Generate a new project</source> - <translation>Genera un nuovo progetto</translation> - </message> - <message> <location filename="Project/Project.py" line="2874"/> + <source>&New...</source> + <translation>&Nuovo...</translation> + </message> + <message> + <location filename="Project/Project.py" line="2878"/> + <source>Generate a new project</source> + <translation>Genera un nuovo progetto</translation> + </message> + <message> + <location filename="Project/Project.py" line="2879"/> <source><b>New...</b><p>This opens a dialog for entering the info for a new project.</p></source> <translation><b>Nuovo...</b><p>Apre un dialogo per l'inserimento delle informazioni per un nuovo progetto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2882"/> - <source>&Open...</source> - <translation>&Apri...</translation> - </message> - <message> - <location filename="Project/Project.py" line="2886"/> - <source>Open an existing project</source> - <translation>Apri un progetto esistente</translation> - </message> - <message> <location filename="Project/Project.py" line="2887"/> + <source>&Open...</source> + <translation>&Apri...</translation> + </message> + <message> + <location filename="Project/Project.py" line="2891"/> + <source>Open an existing project</source> + <translation>Apri un progetto esistente</translation> + </message> + <message> + <location filename="Project/Project.py" line="2892"/> <source><b>Open...</b><p>This opens an existing project.</p></source> <translation><b>Apri...</b><p>Apre un progetto esistente.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2894"/> + <location filename="Project/Project.py" line="2899"/> <source>Close project</source> <translation>Chiudi progetto</translation> </message> <message> - <location filename="Project/Project.py" line="2894"/> + <location filename="Project/Project.py" line="2899"/> <source>&Close</source> <translation>&Chiudi</translation> </message> <message> - <location filename="Project/Project.py" line="2897"/> + <location filename="Project/Project.py" line="2902"/> <source>Close the current project</source> <translation>Chiudi il progetto corrente</translation> </message> <message> - <location filename="Project/Project.py" line="2898"/> + <location filename="Project/Project.py" line="2903"/> <source><b>Close</b><p>This closes the current project.</p></source> <translation><b>Chiudi</b><p>Chiude l'attuale progetto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2905"/> + <location filename="Project/Project.py" line="2910"/> <source>Save project</source> <translation>Salva progetto</translation> </message> <message> - <location filename="Project/Project.py" line="2908"/> + <location filename="Project/Project.py" line="2913"/> <source>Save the current project</source> <translation>Salva il progetto corrente</translation> </message> <message> - <location filename="Project/Project.py" line="2909"/> + <location filename="Project/Project.py" line="2914"/> <source><b>Save</b><p>This saves the current project.</p></source> <translation><b>Salva</b><p>Salva l'attuale progetto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2916"/> + <location filename="Project/Project.py" line="2921"/> <source>Save &as...</source> <translation>S&alva come...</translation> </message> <message> - <location filename="Project/Project.py" line="2919"/> + <location filename="Project/Project.py" line="2924"/> <source>Save the current project to a new file</source> <translation>Salva il progetto attuale come un nuovo file</translation> </message> <message> - <location filename="Project/Project.py" line="2920"/> + <location filename="Project/Project.py" line="2925"/> <source><b>Save as</b><p>This saves the current project to a new file.</p></source> <translation><b>Salva as </b><p>Salva l'attuale progetto come nuovo.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2957"/> + <location filename="Project/Project.py" line="2962"/> <source>Add translation to project</source> <translation>Aggiungi le traduzioni al progetto</translation> </message> <message> - <location filename="Project/Project.py" line="2957"/> + <location filename="Project/Project.py" line="2962"/> <source>Add &translation...</source> <translation>Aggiungi &traduzione...</translation> </message> <message> - <location filename="Project/Project.py" line="2961"/> + <location filename="Project/Project.py" line="2966"/> <source>Add a translation to the current project</source> <translation>Aggiungi le traduzioni al progetto corrente</translation> </message> <message> - <location filename="Project/Project.py" line="2963"/> + <location filename="Project/Project.py" line="2968"/> <source><b>Add translation...</b><p>This opens a dialog for add a translation to the current project.</p></source> <translation><b>Aggiungi traduzione...</b><p>Apre un dialogo per aggiungere una traduzione al progetto corrente.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2971"/> + <location filename="Project/Project.py" line="2976"/> <source>Search new files</source> <translation>Cerca nuovi file</translation> </message> <message> - <location filename="Project/Project.py" line="2971"/> + <location filename="Project/Project.py" line="2976"/> <source>Searc&h new files...</source> <translation>Cerca &nuovi file...</translation> </message> <message> - <location filename="Project/Project.py" line="2974"/> + <location filename="Project/Project.py" line="2979"/> <source>Search new files in the project directory.</source> <translation>Cerca nei file nella directory del progetto.</translation> </message> <message> - <location filename="Project/Project.py" line="2983"/> + <location filename="Project/Project.py" line="2988"/> <source>Project properties</source> <translation>Proprietà del progetto</translation> </message> <message> - <location filename="Project/Project.py" line="2983"/> + <location filename="Project/Project.py" line="2988"/> <source>&Properties...</source> <translation>&Proprietà...</translation> </message> <message> - <location filename="Project/Project.py" line="2986"/> + <location filename="Project/Project.py" line="2991"/> <source>Show the project properties</source> <translation>Mostra le proprietà del progetto</translation> </message> <message> - <location filename="Project/Project.py" line="2987"/> + <location filename="Project/Project.py" line="2992"/> <source><b>Properties...</b><p>This shows a dialog to edit the project properties.</p></source> <translation><b>Proprietà...</b><p>Mosta un dialogo per modificare le proprietà di un progetto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3095"/> + <location filename="Project/Project.py" line="3100"/> <source>Load session</source> <translation>Carica sessione</translation> </message> <message> - <location filename="Project/Project.py" line="3098"/> + <location filename="Project/Project.py" line="3103"/> <source>Load the projects session file.</source> <translation>Carica il file di sessione del progetto.</translation> </message> <message> - <location filename="Project/Project.py" line="3099"/> + <location filename="Project/Project.py" line="3104"/> <source><b>Load session</b><p>This loads the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Carica sessione</b><p>Questo carica la sessione del progetto.La sessione è composta dai seguenti dati.<br>- tutti i file sorgente aperti<br>- tutti i breakpoint<br>- gli argomenti alla riga di comango<br>- la directory di lavoro<br>- il flag di segnalazione delle eccezioni</p></translation> </message> <message> - <location filename="Project/Project.py" line="3112"/> + <location filename="Project/Project.py" line="3117"/> <source>Save session</source> <translation>Salva sessione</translation> </message> <message> - <location filename="Project/Project.py" line="3115"/> + <location filename="Project/Project.py" line="3120"/> <source>Save the projects session file.</source> <translation>Salva il file sessione del progetto.</translation> </message> <message> - <location filename="Project/Project.py" line="3116"/> + <location filename="Project/Project.py" line="3121"/> <source><b>Save session</b><p>This saves the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Salva sessione</b><p>Questo carica la sessione del progetto.La sessione è composta dai seguenti dati.<br>- tutti i file sorgente aperti<br>- tutti i breakpoint<br>- gli argomenti alla riga di comango<br>- la directory di lavoro<br>- il flag di segnalazione delle eccezioni</p></translation> </message> <message> - <location filename="Project/Project.py" line="3142"/> - <source>Code Metrics</source> - <translation>Statistiche codice</translation> - </message> - <message> - <location filename="Project/Project.py" line="3142"/> - <source>&Code Metrics...</source> - <translation>Statistiche &codice...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3145"/> - <source>Show some code metrics for the project.</source> - <translation>Mostra alcune statistiche del codice per il progetto.</translation> - </message> - <message> <location filename="Project/Project.py" line="3147"/> + <source>Code Metrics</source> + <translation>Statistiche codice</translation> + </message> + <message> + <location filename="Project/Project.py" line="3147"/> + <source>&Code Metrics...</source> + <translation>Statistiche &codice...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3150"/> + <source>Show some code metrics for the project.</source> + <translation>Mostra alcune statistiche del codice per il progetto.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3152"/> <source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source> <translation><b>Statistiche codice...</b><p>Mostra alcune statistiche di tutti i file Python nel progetto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3154"/> - <source>Python Code Coverage</source> - <translation>Analisi codice Python</translation> - </message> - <message> - <location filename="Project/Project.py" line="3154"/> - <source>Code Co&verage...</source> - <translation>A&nalisi codice...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3157"/> - <source>Show code coverage information for the project.</source> - <translation>Mostra le informazioni dell'analisi del codice del progetto.</translation> - </message> - <message> <location filename="Project/Project.py" line="3159"/> + <source>Python Code Coverage</source> + <translation>Analisi codice Python</translation> + </message> + <message> + <location filename="Project/Project.py" line="3159"/> + <source>Code Co&verage...</source> + <translation>A&nalisi codice...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3162"/> + <source>Show code coverage information for the project.</source> + <translation>Mostra le informazioni dell'analisi del codice del progetto.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3164"/> <source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source> <translation><b>Analisi codice...</b><p>Mostra le analisi del codice di tutti i file Python nel progetto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3839"/> + <location filename="Project/Project.py" line="3844"/> <source>Profile Data</source> <translation>Profilazione dati</translation> </message> <message> - <location filename="Project/Project.py" line="3167"/> - <source>&Profile Data...</source> - <translation>&Profilazione dati...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3170"/> - <source>Show profiling data for the project.</source> - <translation>Mostra la profilazione dei dati per il progetto.</translation> - </message> - <message> <location filename="Project/Project.py" line="3172"/> + <source>&Profile Data...</source> + <translation>&Profilazione dati...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3175"/> + <source>Show profiling data for the project.</source> + <translation>Mostra la profilazione dei dati per il progetto.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3177"/> <source><b>Profile Data...</b><p>This shows the profiling data for the project.</p></source> <translation><b>Profilazione dati...</b><p>Mostra la profilazione dei dati per il progetto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3892"/> + <location filename="Project/Project.py" line="3897"/> <source>Application Diagram</source> <translation>Diagrammi dell'applicazione</translation> </message> <message> - <location filename="Project/Project.py" line="3179"/> - <source>&Application Diagram...</source> - <translation>Diagramma dell' &Applicazione...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3182"/> - <source>Show a diagram of the project.</source> - <translation>Mostra un diagramma del progetto.</translation> - </message> - <message> <location filename="Project/Project.py" line="3184"/> + <source>&Application Diagram...</source> + <translation>Diagramma dell' &Applicazione...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3187"/> + <source>Show a diagram of the project.</source> + <translation>Mostra un diagramma del progetto.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3189"/> <source><b>Application Diagram...</b><p>This shows a diagram of the project.</p></source> <translation><b>Diagrammi dell'applicazione...</b><p>Mostra un diagramma del progetto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3257"/> + <location filename="Project/Project.py" line="3262"/> <source>Open &Recent Projects</source> <translation>Apri un progetto &recente</translation> </message> <message> - <location filename="Project/Project.py" line="3264"/> + <location filename="Project/Project.py" line="3269"/> <source>&Diagrams</source> <translation>&Diagrammi</translation> </message> <message> - <location filename="Project/Project.py" line="3261"/> + <location filename="Project/Project.py" line="3266"/> <source>Chec&k</source> <translation>&Controlla</translation> </message> <message> - <location filename="Project/Project.py" line="3258"/> - <source>&Version Control</source> - <translation>Controllo di &Versione</translation> - </message> - <message> <location filename="Project/Project.py" line="3263"/> + <source>&Version Control</source> + <translation>Controllo di &Versione</translation> + </message> + <message> + <location filename="Project/Project.py" line="3268"/> <source>Sho&w</source> <translation>&Mostra</translation> </message> <message> - <location filename="Project/Project.py" line="3266"/> + <location filename="Project/Project.py" line="3271"/> <source>Source &Documentation</source> <translation>&Documentazione sorgenti</translation> </message> <message> - <location filename="Project/Project.py" line="3542"/> + <location filename="Project/Project.py" line="3547"/> <source>Search New Files</source> <translation>Cerca Nuovi File</translation> </message> <message> - <location filename="Project/Project.py" line="3542"/> + <location filename="Project/Project.py" line="3547"/> <source>There were no new files found to be added.</source> <translation>Non sono stati trovati file da aggiungere.</translation> </message> <message> - <location filename="Project/Project.py" line="3680"/> + <location filename="Project/Project.py" line="3685"/> <source>Version Control System</source> <translation>Version Control System</translation> </message> <message> - <location filename="Project/Project.py" line="3772"/> + <location filename="Project/Project.py" line="3777"/> <source>Coverage Data</source> <translation>Dati Analisi</translation> </message> <message> - <location filename="Project/Project.py" line="3818"/> + <location filename="Project/Project.py" line="3823"/> <source>There is no main script defined for the current project. Aborting</source> <translation>Non c'è uno script principale definito per il progetto. Esco</translation> </message> @@ -27442,37 +27500,37 @@ <translation>Seleziona il version control system per il progetto</translation> </message> <message> - <location filename="Project/Project.py" line="2943"/> + <location filename="Project/Project.py" line="2948"/> <source>Add directory to project</source> <translation>Aggiungi directory al progetto</translation> </message> <message> - <location filename="Project/Project.py" line="2943"/> + <location filename="Project/Project.py" line="2948"/> <source>Add directory...</source> <translation>Aggiungi directory...</translation> </message> <message> - <location filename="Project/Project.py" line="2947"/> + <location filename="Project/Project.py" line="2952"/> <source>Add a directory to the current project</source> <translation>Aggiungi una directory al progetto corrente</translation> </message> <message> - <location filename="Project/Project.py" line="2949"/> + <location filename="Project/Project.py" line="2954"/> <source><b>Add directory...</b><p>This opens a dialog for adding a directory to the current project.</p></source> <translation><b>Aggiungi directory...</b><p>Apre un dialogo per aggiungere una directory al progetto corrente.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3793"/> + <location filename="Project/Project.py" line="3798"/> <source>Code Coverage</source> <translation>Analisi codice</translation> </message> <message> - <location filename="Project/Project.py" line="3793"/> + <location filename="Project/Project.py" line="3798"/> <source>Please select a coverage file</source> <translation>Per favore seleziona un file per l'analisi</translation> </message> <message> - <location filename="Project/Project.py" line="3839"/> + <location filename="Project/Project.py" line="3844"/> <source>Please select a profile file</source> <translation>Per favore seleziona un file per la profilazione</translation> </message> @@ -27482,17 +27540,17 @@ <translation>Cancella sessione di progetto</translation> </message> <message> - <location filename="Project/Project.py" line="3129"/> + <location filename="Project/Project.py" line="3134"/> <source>Delete session</source> <translation>Cancella sessione</translation> </message> <message> - <location filename="Project/Project.py" line="3132"/> + <location filename="Project/Project.py" line="3137"/> <source>Delete the projects session file.</source> <translation>Cancella il file di sessione del progetto.</translation> </message> <message> - <location filename="Project/Project.py" line="3133"/> + <location filename="Project/Project.py" line="3138"/> <source><b>Delete session</b><p>This deletes the projects session file</p></source> <translation><b>Cancella sessione</b><p>Cancella la sessione del progetto.</p></translation> </message> @@ -27502,7 +27560,7 @@ <translation>File Ruby (*.rb);;</translation> </message> <message> - <location filename="Project/Project.py" line="2975"/> + <location filename="Project/Project.py" line="2980"/> <source><b>Search new files...</b><p>This searches for new files (sources, *.ui, *.idl) in the project directory and registered subdirectories.</p></source> <translation><b>Cerca nuovi file...</b><p>Cerca per nuovi file (sorgenti, *.ui, *.idl) nella directory del progetto e in tutte le sottodirectory registrate.</p></translation> </message> @@ -27517,7 +27575,7 @@ <translation>Altro</translation> </message> <message> - <location filename="Project/Project.py" line="3892"/> + <location filename="Project/Project.py" line="3897"/> <source>Include module names?</source> <translation>Includi i nomi dei moduli ?</translation> </message> @@ -27552,152 +27610,152 @@ <translation>Cancella le proprietà del debugger</translation> </message> <message> - <location filename="Project/Project.py" line="3037"/> + <location filename="Project/Project.py" line="3042"/> <source>Debugger Properties</source> <translation>Proprietà Debugger</translation> </message> <message> - <location filename="Project/Project.py" line="3037"/> + <location filename="Project/Project.py" line="3042"/> <source>Debugger &Properties...</source> <translation>&Proprietà Debugger...</translation> </message> <message> - <location filename="Project/Project.py" line="3040"/> + <location filename="Project/Project.py" line="3045"/> <source>Show the debugger properties</source> <translation>Mostra le proprietàd el debugger</translation> </message> <message> - <location filename="Project/Project.py" line="3041"/> + <location filename="Project/Project.py" line="3046"/> <source><b>Debugger Properties...</b><p>This shows a dialog to edit project specific debugger settings.</p></source> <translation><b>Proprietà debugger...</b><p>Mostra un dialogo per modificare le impostazioni specifiche per il progetto del debugger.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3048"/> + <location filename="Project/Project.py" line="3053"/> <source>Load</source> <translation>Carica</translation> </message> <message> - <location filename="Project/Project.py" line="3048"/> + <location filename="Project/Project.py" line="3053"/> <source>&Load</source> <translation>&Carica</translation> </message> <message> - <location filename="Project/Project.py" line="3051"/> + <location filename="Project/Project.py" line="3056"/> <source>Load the debugger properties</source> <translation>Carica le proprietàd el debugger</translation> </message> <message> - <location filename="Project/Project.py" line="3059"/> + <location filename="Project/Project.py" line="3064"/> <source>Save</source> <translation>Salva</translation> </message> <message> - <location filename="Project/Project.py" line="3062"/> + <location filename="Project/Project.py" line="3067"/> <source>Save the debugger properties</source> <translation>Salva le proprietà del debugger</translation> </message> <message> - <location filename="Project/Project.py" line="3070"/> + <location filename="Project/Project.py" line="3075"/> <source>Delete</source> <translation>Cancella</translation> </message> <message> - <location filename="Project/Project.py" line="3070"/> + <location filename="Project/Project.py" line="3075"/> <source>&Delete</source> <translation>&Cancella</translation> </message> <message> - <location filename="Project/Project.py" line="3073"/> + <location filename="Project/Project.py" line="3078"/> <source>Delete the debugger properties</source> <translation>Cancella le proprietà del debugger</translation> </message> <message> - <location filename="Project/Project.py" line="3082"/> + <location filename="Project/Project.py" line="3087"/> <source>Reset</source> <translation>Resetta</translation> </message> <message> - <location filename="Project/Project.py" line="3082"/> + <location filename="Project/Project.py" line="3087"/> <source>&Reset</source> <translation>&Resetta</translation> </message> <message> - <location filename="Project/Project.py" line="3085"/> + <location filename="Project/Project.py" line="3090"/> <source>Reset the debugger properties</source> <translation>Resetta le proprietà del debugger</translation> </message> <message> - <location filename="Project/Project.py" line="3268"/> + <location filename="Project/Project.py" line="3273"/> <source>Debugger</source> <translation>Debugger</translation> </message> <message> - <location filename="Project/Project.py" line="3265"/> + <location filename="Project/Project.py" line="3270"/> <source>Session</source> <translation>Sessione</translation> </message> <message> - <location filename="Project/Project.py" line="3052"/> + <location filename="Project/Project.py" line="3057"/> <source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source> <translation><b>Carica le proprietà del debugger</b><p>Carica le proprietà del debugger specifiche per il progetto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3063"/> + <location filename="Project/Project.py" line="3068"/> <source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source> <translation><b>Salva le proprietà del debugger</b><p>Salva le proprietà del debugger specifiche per il progetto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3074"/> + <location filename="Project/Project.py" line="3079"/> <source><b>Delete Debugger Properties</b><p>This deletes the file containing the project specific debugger settings.</p></source> <translation><b>Cancella le proprietà del debugger</b><p>Cancella il file che contiene le proprietà del debugger specifiche per il progetto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3086"/> + <location filename="Project/Project.py" line="3091"/> <source><b>Reset Debugger Properties</b><p>This resets the project specific debugger settings.</p></source> <translation><b>Azzera le proprietà del debugger</b><p>Azzera le proprietà del debugger specifiche per il progetto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3006"/> - <source>Filetype Associations</source> - <translation>Associazione tipi file</translation> - </message> - <message> - <location filename="Project/Project.py" line="3006"/> - <source>Filetype Associations...</source> - <translation>Associazione tipi file...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3009"/> - <source>Show the project filetype associations</source> - <translation>Mostra le associazioni dei tipi di file del progetto</translation> - </message> - <message> <location filename="Project/Project.py" line="3011"/> + <source>Filetype Associations</source> + <translation>Associazione tipi file</translation> + </message> + <message> + <location filename="Project/Project.py" line="3011"/> + <source>Filetype Associations...</source> + <translation>Associazione tipi file...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3014"/> + <source>Show the project filetype associations</source> + <translation>Mostra le associazioni dei tipi di file del progetto</translation> + </message> + <message> + <location filename="Project/Project.py" line="3016"/> <source><b>Filetype Associations...</b><p>This shows a dialog to edit the filetype associations of the project. These associations determine the type (source, form, interface or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.</p></source> <translation><b>Associazione tipi file...</b><p>Mostra un dialogo per modificare le associazioni dei tipi file del progetto. Queste associazioni determinano il tipo (codice sorgente, interfaccia o altro) con un pattern del nome file. Sono usati quando aggiungi un file al progetto e quanto esegui una ricerca per nuovi file.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3269"/> + <location filename="Project/Project.py" line="3274"/> <source>Pac&kagers</source> <translation>Pac&kagers</translation> </message> <message> - <location filename="Project/Project.py" line="2929"/> - <source>Add files to project</source> - <translation>Aggiungi file al progetto</translation> - </message> - <message> - <location filename="Project/Project.py" line="2929"/> - <source>Add &files...</source> - <translation>Aggiungi &files...</translation> - </message> - <message> - <location filename="Project/Project.py" line="2933"/> - <source>Add files to the current project</source> - <translation>Aggiungi file al progetto corrente</translation> - </message> - <message> <location filename="Project/Project.py" line="2934"/> + <source>Add files to project</source> + <translation>Aggiungi file al progetto</translation> + </message> + <message> + <location filename="Project/Project.py" line="2934"/> + <source>Add &files...</source> + <translation>Aggiungi &files...</translation> + </message> + <message> + <location filename="Project/Project.py" line="2938"/> + <source>Add files to the current project</source> + <translation>Aggiungi file al progetto corrente</translation> + </message> + <message> + <location filename="Project/Project.py" line="2939"/> <source><b>Add files...</b><p>This opens a dialog for adding files to the current project. The place to add is determined by the file extension.</p></source> <translation><b>Aggiungi files...</b><p>Apre un dialogo per aggiungere file al progetto corrente. Il posto dove aggiungerli è determinato dall'estensione.</p></translation> </message> @@ -27717,17 +27775,17 @@ <translation>File progetto (*.e4p)</translation> </message> <message> - <location filename="Project/Project.py" line="3256"/> + <location filename="Project/Project.py" line="3261"/> <source>&Project</source> <translation>&Progetto</translation> </message> <message> - <location filename="Project/Project.py" line="3371"/> + <location filename="Project/Project.py" line="3376"/> <source>Project</source> <translation>Progetto</translation> </message> <message> - <location filename="Project/Project.py" line="3432"/> + <location filename="Project/Project.py" line="3437"/> <source>&Clear</source> <translation>Pulis&ci</translation> </message> @@ -27742,22 +27800,22 @@ <translation>Salva le proprietà utente del progetto</translation> </message> <message> - <location filename="Project/Project.py" line="2994"/> + <location filename="Project/Project.py" line="2999"/> <source>User project properties</source> <translation>Proprietà utente del progetto</translation> </message> <message> - <location filename="Project/Project.py" line="2994"/> - <source>&User Properties...</source> - <translation>Proprietà &utente...</translation> - </message> - <message> - <location filename="Project/Project.py" line="2997"/> - <source>Show the user specific project properties</source> - <translation>Mostra le proprietà del multiprogetto specifiche dell'utente</translation> - </message> - <message> <location filename="Project/Project.py" line="2999"/> + <source>&User Properties...</source> + <translation>Proprietà &utente...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3002"/> + <source>Show the user specific project properties</source> + <translation>Mostra le proprietà del multiprogetto specifiche dell'utente</translation> + </message> + <message> + <location filename="Project/Project.py" line="3004"/> <source><b>User Properties...</b><p>This shows a dialog to edit the user specific project properties.</p></source> <translation><b>Proprietà utente...</b><p>Mosta un dialogo per modificare le proprietà utente di un progetto.</p></translation> </message> @@ -27775,37 +27833,37 @@ </translation> </message> <message> - <location filename="Project/Project.py" line="4023"/> + <location filename="Project/Project.py" line="4028"/> <source>Create Package List</source> <translation>Crea lista del package</translation> </message> <message> - <location filename="Project/Project.py" line="3193"/> + <location filename="Project/Project.py" line="3198"/> <source>Create &Package List</source> <translation>Crea lista del &package</translation> </message> <message> - <location filename="Project/Project.py" line="4183"/> + <location filename="Project/Project.py" line="4188"/> <source>Create Plugin Archive</source> <translation>Crea un archivio per il plugin</translation> </message> <message> - <location filename="Project/Project.py" line="3207"/> + <location filename="Project/Project.py" line="3212"/> <source>Create Plugin &Archive</source> <translation>Crea un &archivio per il plugin</translation> </message> <message> - <location filename="Project/Project.py" line="3996"/> + <location filename="Project/Project.py" line="4001"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation><p>Il file <b>PKGLIST</b> esiste già.</p><p>Sovrascriverlo?</p></translation> </message> <message> - <location filename="Project/Project.py" line="4040"/> + <location filename="Project/Project.py" line="4045"/> <source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source> <translation><p>Il file <b>PKGLIST </b> non esiste. Uscita...</p></translation> </message> <message> - <location filename="Project/Project.py" line="4048"/> + <location filename="Project/Project.py" line="4053"/> <source>The project does not have a main script defined. Aborting...</source> <translation>Non c'è uno script principale definito per il progetto. Esco...</translation> </message> @@ -27830,12 +27888,12 @@ <translation>Registrazione tipo progetto</translation> </message> <message> - <location filename="Project/Project.py" line="3222"/> + <location filename="Project/Project.py" line="3227"/> <source>Create Plugin Archive (Snapshot)</source> <translation>Crea un archivio per il plugin (Snapshot)</translation> </message> <message> - <location filename="Project/Project.py" line="3222"/> + <location filename="Project/Project.py" line="3227"/> <source>Create Plugin Archive (&Snapshot)</source> <translation>Crea un archivio per il plugin (&Snapshot)</translation> </message> @@ -27855,22 +27913,22 @@ <translation>Inserisci il path per il file di traduzione (usa '%language% al posto del codice lingua):</translation> </message> <message> - <location filename="Project/Project.py" line="3021"/> + <location filename="Project/Project.py" line="3026"/> <source>Lexer Associations</source> <translation>Associazioni analizzatore lessicale</translation> </message> <message> - <location filename="Project/Project.py" line="3021"/> - <source>Lexer Associations...</source> - <translation>Associazioni analizzatore lessicale...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3024"/> - <source>Show the project lexer associations (overriding defaults)</source> - <translation>Mostra le associazioni degli analizzatori lessicali del progetto (sovrascrivendo i default)</translation> - </message> - <message> <location filename="Project/Project.py" line="3026"/> + <source>Lexer Associations...</source> + <translation>Associazioni analizzatore lessicale...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3029"/> + <source>Show the project lexer associations (overriding defaults)</source> + <translation>Mostra le associazioni degli analizzatori lessicali del progetto (sovrascrivendo i default)</translation> + </message> + <message> + <location filename="Project/Project.py" line="3031"/> <source><b>Lexer Associations...</b><p>This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.</p></source> <translation><b>Associazioni analizzatore lessicale...</b><p>Mostra un dialogo per modificare le associazioni degli analizzatori lessicali dei progetti. Queste associazioni sovrascrivono the impostazioni globali. Gli analizzatori lessicali sono utilizzati per l'evidenziazione del testo nell'editor.</p></translation> </message> @@ -27995,72 +28053,72 @@ <translation><p>La directory del progetto <b>{0}</b> non può essere creata.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3197"/> + <location filename="Project/Project.py" line="3202"/> <source>Create an initial PKGLIST file for an eric5 plugin.</source> <translation>Crea un PKGLIST iniziale per un plugin di eric5.</translation> </message> <message> - <location filename="Project/Project.py" line="3199"/> + <location filename="Project/Project.py" line="3204"/> <source><b>Create Package List</b><p>This creates an initial list of files to include in an eric5 plugin archive. The list is created from the project file.</p></source> <translation><b>Crea la lista del Package<b><p>Crea una lista iniziale dei file da includere nell'archivio di un plugin di eric5. La lista è creata partendo dal file progetto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3211"/> + <location filename="Project/Project.py" line="3216"/> <source>Create an eric5 plugin archive file.</source> <translation>Crea un file archivio per il plugin di eric5.</translation> </message> <message> - <location filename="Project/Project.py" line="3213"/> + <location filename="Project/Project.py" line="3218"/> <source><b>Create Plugin Archive</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name.</p></source> <translation><b>Crea Archivio Plugin</b><p>Crea un archivio per il plugin eric5 usando la lista dei file fornita nel file PKGLIST. Il nome dell'archivio è costruito dal nome dello script.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3226"/> + <location filename="Project/Project.py" line="3231"/> <source>Create an eric5 plugin archive file (snapshot release).</source> <translation>Crea un file archivio per il plugin di eric5 (snapshot release).</translation> </message> <message> - <location filename="Project/Project.py" line="3228"/> + <location filename="Project/Project.py" line="3233"/> <source><b>Create Plugin Archive (Snapshot)</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name. The version entry of the main script is modified to reflect a snapshot release.</p></source> <translation><b>Crea un archivio plugin (Snapshot)</b><p>Crea un file archivio di un plugin eric5 usando la lista di file fornita nel file PKGLIST. Il nome dell'archivio è determinato dal nome dello script principale. La versione dello script principale viene modificata per riflettere la release dello snapshot.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3671"/> + <location filename="Project/Project.py" line="3676"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Reverting override.</p><p>{1}</p></source> <translation><p>VCS selezionato <b>{0}</b>non trovato.<br>Ripristino al valore precedente.</p><p>{1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="3680"/> + <location filename="Project/Project.py" line="3685"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Disabling version control.</p><p>{1}</p></source> <translation><p>VCS selezionato <b>{0}</b>non trovato.<br>Disabilito il controllo di versione.</p><p>{1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4023"/> + <location filename="Project/Project.py" line="4028"/> <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> <translation><p>Il file <b>PKGLIST</b> non può essere creato.<br />Motivo: {0}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4060"/> + <location filename="Project/Project.py" line="4065"/> <source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source> <translation><p>Il file <b>PKGLIST</b> non può essere letto.<br />Motivo: {0}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4071"/> + <location filename="Project/Project.py" line="4076"/> <source><p>The eric5 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation><p>Il file archivio del plugin di eric5<b>{0}</b> non può essere creato.<br />Motivo: {1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4091"/> + <location filename="Project/Project.py" line="4096"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation><p>Il file <b>{0}</b> non può essere aggiunto all'archivio.Lo ignoro.</p><p>Motivo: {1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4103"/> + <location filename="Project/Project.py" line="4108"/> <source><p>The eric5 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation><p>Il file archivio del plugin di eric5<b>{0} </b> è stato creato con successo.</p></translation> </message> <message> - <location filename="Project/Project.py" line="4183"/> + <location filename="Project/Project.py" line="4188"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation><p>Il file plugin <b>{0}</b> non può essere salvato.<br />Motivo: {1}</p></translation> </message> @@ -29741,22 +29799,22 @@ <context> <name>Purge</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="91"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="97"/> <source>Purge All Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="98"/> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="101"/> <source>Purge Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="102"/> <source>Do really want to delete files not tracked by Mercurial?</source> <translation type="unfinished"></translation> </message> @@ -31797,177 +31855,177 @@ <context> <name>Queues</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="256"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="276"/> <source>New Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="325"/> <source>Update Current Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="356"/> - <source>Pop Patches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="360"/> - <source>Push Patches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="364"/> - <source>Go to Patch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> - <source>Select Patch</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="376"/> + <source>Pop Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="380"/> + <source>Push Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="384"/> + <source>Go to Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="515"/> + <source>Select Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="396"/> <source>Select the target patch name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="515"/> <source>No patches to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="447"/> <source>Finish Applied Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="459"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="479"/> <source>Rename Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="501"/> <source>Select the patch to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="490"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="510"/> <source>Delete Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="535"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="555"/> <source>Fold Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="551"/> <source>No patches selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="535"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="555"/> <source>No patches available to be folded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="559"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="579"/> <source>List Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="559"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="579"/> <source>No patches available to list guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="594"/> - <source>Define Guards</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> - <source>No patches available to define guards for.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> - <source>Drop All Guards</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="614"/> + <source>Define Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <source>No patches available to define guards for.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <source>Drop All Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="634"/> <source>Select the patch to drop guards for (leave empty for the current patch):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="693"/> <source>Set Active Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="693"/> <source>No guards available to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="691"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="715"/> <source>Deactivate Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="753"/> <source>Create New Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="755"/> <source>Rename Active Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="757"/> - <source>Error while creating a new queue.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/> - <source>Error while renaming the active queue.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="787"/> - <source>Purge Queue</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="789"/> + <source>Error while creating a new queue.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="792"/> + <source>Error while renaming the active queue.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="819"/> + <source>Purge Queue</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="821"/> <source>Delete Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="823"/> <source>Activate Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="820"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="860"/> <source>Error while purging the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="862"/> <source>Error while deleting the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="864"/> <source>Error while setting the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="847"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="887"/> <source>Available Queues</source> <translation type="unfinished"></translation> </message> @@ -48771,24 +48829,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1168"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Origine #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1668"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tags</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1676"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1116"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1184"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -48797,7 +48855,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1214"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -48814,24 +48872,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1566"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1662"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1680"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Origini</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1683"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -48841,7 +48899,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_ru.ts Wed Aug 31 19:28:49 2011 +0200 +++ b/i18n/eric5_ru.ts Wed Aug 31 19:35:11 2011 +0200 @@ -1377,62 +1377,62 @@ <context> <name>Bookmarks</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="129"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="147"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="147"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="159"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="187"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="220"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="304"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="304"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="316"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="337"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="337"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="334"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="349"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -15487,250 +15487,270 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> <source>The hg process finished with the exit code {0}</source> <translation>Процесс hg завершился с кодом возврата {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="234"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> <source>Create project repository</source> <translation>Создать репозиторий проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> <source>The project repository could not be created.</source> <translation>Не могу создать репозиторий проекта.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> - <source>Creating Mercurial repository</source> - <translation>Создание репозитория</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> + <source>Creating Mercurial repository</source> + <translation>Создание репозитория</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> <source>Initial commit to Mercurial repository</source> <translation>Первичная подача в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="331"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="351"/> <source>Cloning project from a Mercurial repository</source> <translation>Создание копии репозитория</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="427"/> <source>Commiting changes to Mercurial repository</source> - <translation>Подача изменений в репозиторий</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="475"/> + <translation type="obsolete">Подача изменений в репозиторий</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/> <source>Synchronizing with the Mercurial repository</source> <translation>Синхронизация с репозиторием</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="523"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="558"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Добавление файлов/каталогов в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="622"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Удаление файлов/каталогов из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="686"/> <source>Renaming {0}</source> <translation>Переименование {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="869"/> <source>Merging</source> <translation>Слияние</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1224"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1298"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> <source>Mercurial Log</source> <translation>лог</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> <source>Select number of entries to show.</source> <translation>Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1477"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> <source>Pulling from a remote Mercurial repository</source> <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1509"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1599"/> <source>Pushing to a remote Mercurial repository</source> <translation>Загрузка изменений в удалённый репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source>Resolving files/directories</source> <translation>Разрешение конфликтов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="746"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="791"/> <source>Taging in the Mercurial repository</source> <translation>Создание меток в репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="776"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/> <source>Reverting changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1047"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> <source>Mercurial command</source> <translation>Mercurial команда</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source>Create Branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source>Enter branch name</source> <translation>Введите имя ветви</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1656"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1736"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1856"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочий каталог?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1679"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> <source>Showing current branch</source> <translation>Текущая ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation>Неправильная подкоманда ({0}) для Bisect.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> - <source>Mercurial Bisect ({0})</source> - <translation>Mercurial Bisect ({0})</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> - <source>Preview changegroup</source> - <translation>Предпросмотр группы изменений</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> - <source>Identifying project directory</source> - <translation>Каталог проекта</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> - <source>Create .hgignore file</source> - <translation>Создать файл .hgignore</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation><p>Файл <b>{0}</b> уже существует. Перезаписать?</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> - <source>Removing files from the Mercurial repository only</source> - <translation>Удаление файлов только из репозитория</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation>Mercurial файлы изменений (*.hg)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> - <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> - <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2006"/> - <source>Identifying changegroup file</source> - <translation>Файлы изменений</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> - <source>Backing out changeset</source> - <translation>Отмена изменений</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation>Неправильная подкоманда ({0}) для Bisect.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <source>Mercurial Bisect ({0})</source> + <translation>Mercurial Bisect ({0})</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2098"/> + <source>Preview changegroup</source> + <translation>Предпросмотр группы изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <source>Identifying project directory</source> + <translation>Каталог проекта</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <source>Create .hgignore file</source> + <translation>Создать файл .hgignore</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation><p>Файл <b>{0}</b> уже существует. Перезаписать?</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2225"/> + <source>Removing files from the Mercurial repository only</source> + <translation>Удаление файлов только из репозитория</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation>Mercurial файлы изменений (*.hg)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> + <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2108"/> + <source>Identifying changegroup file</source> + <translation>Файлы изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2281"/> + <source>Backing out changeset</source> + <translation>Отмена изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2024"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл группы изменений<b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2306"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="454"/> + <source>Committing changes to Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <source>Mercurial Command Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2344"/> + <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -15810,12 +15830,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="110"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="110"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -16188,17 +16208,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> <source>Process Generation Error</source> <translation type="unfinished">Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> <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/BookmarksExtension/HgBookmarksInOutDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="165"/> <source>no bookmarks found</source> <translation type="unfinished"></translation> </message> @@ -16288,17 +16308,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> <source>Process Generation Error</source> <translation type="unfinished">Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> <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/BookmarksExtension/HgBookmarksListDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="150"/> <source>no bookmarks defined</source> <translation type="unfinished"></translation> </message> @@ -16417,6 +16437,44 @@ </message> </context> <context> + <name>HgClient</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="76"/> + <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/HgClient.py" line="117"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="119"/> + <source>Received data on unexpected channel.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="124"/> + <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="128"/> + <source>'capabilities' message did not contain any capability.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="136"/> + <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <source>'encoding' message did not contain any encoding.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/> @@ -16633,12 +16691,12 @@ <translation>Alt+П</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -16706,42 +16764,42 @@ <translation>Alt+П</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="206"/> <source>There is no difference.</source> <translation>Различий нет.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="347"/> <source>Save Diff</source> <translation>Сохранить изменения</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="316"/> <source>Patch Files (*.diff)</source> <translation>Файлы изменений (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="347"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Невозможно сохранить патч в файл <b>{0}</b>:<br>Причина: {1}.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="289"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="333"/> <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/HgDiffDialog.py" line="109"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="112"/> <source>Patch Contents</source> <translation type="unfinished"></translation> </message> @@ -16940,7 +16998,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="310"/> <source>Revision</source> <translation type="unfinished">Версия (ревизия)</translation> </message> @@ -17015,17 +17073,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> <source>Process Generation Error</source> <translation type="unfinished">Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> <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/GpgExtension/HgGpgSignaturesDialog.py" line="128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="147"/> <source>no signatures found</source> <translation type="unfinished"></translation> </message> @@ -17063,17 +17121,17 @@ <translation>Задайте поле, по которому фильтровать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1082"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/> <source>Revision</source> <translation>Версия (ревизия)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1079"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1128"/> <source>Author</source> <translation>Автор</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> <source>Message</source> <translation>Сообщение</translation> </message> @@ -17189,27 +17247,27 @@ <translation>Alt+П</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> <source>Added</source> <translation>Добавлено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="116"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Deleted</source> <translation>Удалено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> <source>Modified</source> <translation>Изменено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -17224,17 +17282,17 @@ <translation>Метки</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="492"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="476"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> <source>Mercurial Error</source> <translation>Ошибка Mercurial</translation> </message> @@ -17274,7 +17332,7 @@ <translation>Задайте ветвь, по которой фильтровать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/> <source>All</source> <translation>Все</translation> </message> @@ -17289,7 +17347,7 @@ <translation>лог (исходящий)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> <source>Bookmarks</source> <translation type="unfinished">Закладки</translation> </message> @@ -17377,115 +17435,115 @@ <translation>Alt+П</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="55"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="56"/> <source><b>Processing your request, please wait...</b></source> <translation><b>Запрос обрабатывается, пожалуйста, ждите...</b></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="66"/> <source>Revision</source> <translation>Версия (ревизия)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="259"/> <source>No log available for '{0}'</source> <translation>Отсутствует журнальная записть для '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> <source>diff to {0}</source> <translation>Сравнить с {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> <source>Branches: {0}<br /> </source> <translation>Ветви: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="302"/> <source>Tags: {0}<br /> </source> <translation>Метки: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/> <source>Parents: {0}<br /> </source> <translation>Предки: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="275"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Автор: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="278"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Дата: {0}, {1}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> <source>Added {0}<br /> </source> <translation>Добавлено: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> <source>Modified {0}<br /> </source> <translation>Изменено {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="338"/> <source>Deleted {0}<br /> </source> <translation>Удалено {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="201"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="226"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="228"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="231"/> <source>Mercurial Error</source> <translation>Ошибка Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="288"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Добавлено {0} (скопировано из {1})<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="271"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> @@ -18975,37 +19033,37 @@ <translation type="unfinished">Удалить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> <source>Unsaved Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> <source>Remove Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> <source>Do you really want to remove the selected guards?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> <source>Apply Guard Definitions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/> <source>The Mercurial process did not finish in time.</source> <translation type="unfinished"></translation> </message> @@ -19079,17 +19137,17 @@ <translation type="unfinished">Commit сообщение</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> <source>Process Generation Error</source> <translation type="unfinished">Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> <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/QueuesExtension/HgQueuesHeaderDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="189"/> <source>Error: </source> <translation type="unfinished"></translation> </message> @@ -19107,12 +19165,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="89"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="103"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="94"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> @@ -19197,42 +19255,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> <source>Process Generation Error</source> <translation type="unfinished">Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> <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/QueuesExtension/HgQueuesListDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="219"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="50"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> <source>applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> - <source>guarded</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="53"/> + <source>guarded</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="54"/> <source>missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="292"/> <source>unknown</source> <translation type="unfinished">неизвестный</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> <source>not applied</source> <translation type="unfinished"></translation> </message> @@ -19270,7 +19328,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="111"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="122"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> @@ -19391,12 +19449,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="60"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="62"/> <source>Refresh</source> <translation type="unfinished">Обновить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="62"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="64"/> <source>Press to refresh the queues list</source> <translation type="unfinished"></translation> </message> @@ -19904,7 +19962,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="188"/> <source>Mercurial Status</source> <translation>Mercurial Status</translation> </message> @@ -19981,107 +20039,107 @@ <translation>Нажмите, чтобы обновить отображение статуса</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="62"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="63"/> <source>Commit changes to repository...</source> <translation>Зафиксировать изменения в репозитории...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/> <source>Add to repository</source> <translation>Добавить в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="71"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="72"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="76"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="77"/> <source>Adjust column sizes</source> <translation>Подстроить размеры колонок</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>added</source> <translation>добавлено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> - <source>modified</source> - <translation>изменено</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> - <source>removed</source> - <translation>удалено</translation> + <source>modified</source> + <translation>изменено</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> - <source>not tracked</source> - <translation>не отслеживается</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> - <source>normal</source> - <translation>нормальный</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> - <source>ignored</source> - <translation>игнорировано</translation> + <source>removed</source> + <translation>удалено</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> + <source>not tracked</source> + <translation>не отслеживается</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> + <source>normal</source> + <translation>нормальный</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> + <source>ignored</source> + <translation>игнорировано</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> <source>missing</source> <translation>отсутствует</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="238"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="238"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="540"/> <source>Commit</source> <translation>Зафиксировать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="642"/> <source>There are no uncommitted changes available/selected.</source> <translation>Нет доступных/выбранных неотправленных изменений.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="567"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="567"/> <source>There are no unversioned entries available/selected.</source> <translation>Нет/не выбраны неверсионные элементы.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="625"/> <source>Revert</source> <translation>Откатить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="69"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="70"/> <source>Remove from repository</source> <translation>Удалить из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="588"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="625"/> <source>There are no missing entries available/selected.</source> <translation>Нет/не выбраны пропущенных элементы.</translation> </message> @@ -20156,17 +20214,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="68"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="74"/> <source>Restore missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="452"/> <source>all</source> <translation type="unfinished"></translation> </message> @@ -20176,12 +20234,12 @@ <translation type="obsolete">Различие</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="642"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="540"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> @@ -20189,12 +20247,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="153"/> <source>Mercurial status checked successfully</source> <translation>Статус Mercurial успешно проверен</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="119"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="100"/> <source>Could not start the Mercurial process.</source> <translation>Невозможно запустить процесс Mercurial.</translation> </message> @@ -20286,32 +20344,32 @@ <translation>Alt+П</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="86"/> <source>Mercurial Branches List</source> <translation>Список ветвей</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="87"/> <source>Status</source> <translation>Статус</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="247"/> <source>active</source> <translation>активный</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="252"/> <source>yes</source> <translation>да</translation> </message> @@ -27222,12 +27280,12 @@ <translation>Создать каталог проекта</translation> </message> <message> - <location filename="Project/Project.py" line="2882"/> + <location filename="Project/Project.py" line="2887"/> <source>Open project</source> <translation>Открыть проект</translation> </message> <message> - <location filename="Project/Project.py" line="2916"/> + <location filename="Project/Project.py" line="2921"/> <source>Save project as</source> <translation>Сохранить проект как</translation> </message> @@ -27247,162 +27305,162 @@ <translation>Изменения в текущем проекте не сохранены.</translation> </message> <message> - <location filename="Project/Project.py" line="3059"/> + <location filename="Project/Project.py" line="3064"/> <source>&Save</source> <translation>&Сохранить</translation> </message> <message> - <location filename="Project/Project.py" line="2869"/> + <location filename="Project/Project.py" line="2874"/> <source>New project</source> <translation>Новый проект</translation> </message> <message> - <location filename="Project/Project.py" line="2869"/> - <source>&New...</source> - <translation>&Новый...</translation> - </message> - <message> - <location filename="Project/Project.py" line="2873"/> - <source>Generate a new project</source> - <translation>Создать новый проект</translation> - </message> - <message> <location filename="Project/Project.py" line="2874"/> + <source>&New...</source> + <translation>&Новый...</translation> + </message> + <message> + <location filename="Project/Project.py" line="2878"/> + <source>Generate a new project</source> + <translation>Создать новый проект</translation> + </message> + <message> + <location filename="Project/Project.py" line="2879"/> <source><b>New...</b><p>This opens a dialog for entering the info for a new project.</p></source> <translation><b>Новый...</b><p>Открыть диалог для ввода информации о новом проекте.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2882"/> - <source>&Open...</source> - <translation>&Открыть...</translation> - </message> - <message> - <location filename="Project/Project.py" line="2886"/> - <source>Open an existing project</source> - <translation>Открыть существующий проект</translation> - </message> - <message> <location filename="Project/Project.py" line="2887"/> + <source>&Open...</source> + <translation>&Открыть...</translation> + </message> + <message> + <location filename="Project/Project.py" line="2891"/> + <source>Open an existing project</source> + <translation>Открыть существующий проект</translation> + </message> + <message> + <location filename="Project/Project.py" line="2892"/> <source><b>Open...</b><p>This opens an existing project.</p></source> <translation><b>Открыть...</b><p>Открыть существующий проект.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2894"/> + <location filename="Project/Project.py" line="2899"/> <source>Close project</source> <translation>Закрыть проект</translation> </message> <message> - <location filename="Project/Project.py" line="2894"/> + <location filename="Project/Project.py" line="2899"/> <source>&Close</source> <translation>&Закрыть</translation> </message> <message> - <location filename="Project/Project.py" line="2897"/> + <location filename="Project/Project.py" line="2902"/> <source>Close the current project</source> <translation>Закрыть текущий проект</translation> </message> <message> - <location filename="Project/Project.py" line="2898"/> + <location filename="Project/Project.py" line="2903"/> <source><b>Close</b><p>This closes the current project.</p></source> <translation><b>Закрыть</b><p>Закрыть текущий проект.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2905"/> + <location filename="Project/Project.py" line="2910"/> <source>Save project</source> <translation>Сохранить проект</translation> </message> <message> - <location filename="Project/Project.py" line="2908"/> + <location filename="Project/Project.py" line="2913"/> <source>Save the current project</source> <translation>Сохранить текущий проект</translation> </message> <message> - <location filename="Project/Project.py" line="2909"/> + <location filename="Project/Project.py" line="2914"/> <source><b>Save</b><p>This saves the current project.</p></source> <translation><b>Сохранить</b><p>Сохранить текущий проект.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2916"/> + <location filename="Project/Project.py" line="2921"/> <source>Save &as...</source> <translation>Сохранить &как...</translation> </message> <message> - <location filename="Project/Project.py" line="2919"/> + <location filename="Project/Project.py" line="2924"/> <source>Save the current project to a new file</source> <translation>Сохранить текущий проект в новый файл</translation> </message> <message> - <location filename="Project/Project.py" line="2920"/> + <location filename="Project/Project.py" line="2925"/> <source><b>Save as</b><p>This saves the current project to a new file.</p></source> <translation><b>Сохранить как</b><p> Сохранить текущий проект в новый файл.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2957"/> + <location filename="Project/Project.py" line="2962"/> <source>Add translation to project</source> <translation>Добавить перевод в проект</translation> </message> <message> - <location filename="Project/Project.py" line="2957"/> + <location filename="Project/Project.py" line="2962"/> <source>Add &translation...</source> <translation>Добавить &перевод...</translation> </message> <message> - <location filename="Project/Project.py" line="2961"/> + <location filename="Project/Project.py" line="2966"/> <source>Add a translation to the current project</source> <translation>Добавить перевод в текущий проект</translation> </message> <message> - <location filename="Project/Project.py" line="2963"/> + <location filename="Project/Project.py" line="2968"/> <source><b>Add translation...</b><p>This opens a dialog for add a translation to the current project.</p></source> <translation><b>Добавить перевод...</b><p>Открыть диалог для добавления перевода в текущий проект.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2971"/> + <location filename="Project/Project.py" line="2976"/> <source>Search new files</source> <translation>Поиск новых файлов</translation> </message> <message> - <location filename="Project/Project.py" line="2971"/> + <location filename="Project/Project.py" line="2976"/> <source>Searc&h new files...</source> <translation>Поис&к новых файлов...</translation> </message> <message> - <location filename="Project/Project.py" line="2974"/> + <location filename="Project/Project.py" line="2979"/> <source>Search new files in the project directory.</source> <translation>Поиск новых файлов в каталоге проекта.</translation> </message> <message> - <location filename="Project/Project.py" line="2983"/> + <location filename="Project/Project.py" line="2988"/> <source>Project properties</source> <translation>Свойства проекта</translation> </message> <message> - <location filename="Project/Project.py" line="2983"/> + <location filename="Project/Project.py" line="2988"/> <source>&Properties...</source> <translation>&Свойства...</translation> </message> <message> - <location filename="Project/Project.py" line="2986"/> + <location filename="Project/Project.py" line="2991"/> <source>Show the project properties</source> <translation>Показать свойства проекта</translation> </message> <message> - <location filename="Project/Project.py" line="2987"/> + <location filename="Project/Project.py" line="2992"/> <source><b>Properties...</b><p>This shows a dialog to edit the project properties.</p></source> <translation><b>Свойства...</b><p>Показать диалог для редактирования свойств проекта.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3095"/> + <location filename="Project/Project.py" line="3100"/> <source>Load session</source> <translation>Загрузить сессию</translation> </message> <message> - <location filename="Project/Project.py" line="3098"/> + <location filename="Project/Project.py" line="3103"/> <source>Load the projects session file.</source> <translation>Загрузить файл с сессией проекта.</translation> </message> <message> - <location filename="Project/Project.py" line="3099"/> + <location filename="Project/Project.py" line="3104"/> <source><b>Load session</b><p>This loads the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Загрузить сессию</b> <p>Загрузить файл с сессией проекта. Сессия содержит следующие данные:<br> @@ -27414,17 +27472,17 @@ </p></translation> </message> <message> - <location filename="Project/Project.py" line="3112"/> + <location filename="Project/Project.py" line="3117"/> <source>Save session</source> <translation>Сохранить сессию</translation> </message> <message> - <location filename="Project/Project.py" line="3115"/> + <location filename="Project/Project.py" line="3120"/> <source>Save the projects session file.</source> <translation>Сохранить файл с сессией проекта.</translation> </message> <message> - <location filename="Project/Project.py" line="3116"/> + <location filename="Project/Project.py" line="3121"/> <source><b>Save session</b><p>This saves the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Сохранить сессию</b> <p>Сохранить файл с сессией проекта. Сессия содержит следующие данные:<br> @@ -27436,137 +27494,137 @@ </p></translation> </message> <message> - <location filename="Project/Project.py" line="3142"/> + <location filename="Project/Project.py" line="3147"/> <source>Code Metrics</source> <translation>Статистика кода</translation> </message> <message> - <location filename="Project/Project.py" line="3142"/> - <source>&Code Metrics...</source> - <translation>&Статистика кода...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3145"/> - <source>Show some code metrics for the project.</source> - <translation>Отображает статистику кода для проекта.</translation> - </message> - <message> <location filename="Project/Project.py" line="3147"/> + <source>&Code Metrics...</source> + <translation>&Статистика кода...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3150"/> + <source>Show some code metrics for the project.</source> + <translation>Отображает статистику кода для проекта.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3152"/> <source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source> <translation><b>Статистика кода...</b><p>Отображает статистику кода для проекта.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3154"/> - <source>Python Code Coverage</source> - <translation>Охват кода Python</translation> - </message> - <message> - <location filename="Project/Project.py" line="3154"/> - <source>Code Co&verage...</source> - <translation>&Заключения по коду...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3157"/> - <source>Show code coverage information for the project.</source> - <translation>Показать заключение охвата по коду проекта.</translation> - </message> - <message> <location filename="Project/Project.py" line="3159"/> + <source>Python Code Coverage</source> + <translation>Охват кода Python</translation> + </message> + <message> + <location filename="Project/Project.py" line="3159"/> + <source>Code Co&verage...</source> + <translation>&Заключения по коду...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3162"/> + <source>Show code coverage information for the project.</source> + <translation>Показать заключение охвата по коду проекта.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3164"/> <source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source> <translation><b>Заключение охвата по коду...</b><p>Показать заключение охвата по коду всех файлов проекта.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3839"/> + <location filename="Project/Project.py" line="3844"/> <source>Profile Data</source> <translation>Данные профайлера</translation> </message> <message> - <location filename="Project/Project.py" line="3167"/> - <source>&Profile Data...</source> - <translation>&Данные профайлера...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3170"/> - <source>Show profiling data for the project.</source> - <translation>Отображает результаты профилирования проекта.</translation> - </message> - <message> <location filename="Project/Project.py" line="3172"/> + <source>&Profile Data...</source> + <translation>&Данные профайлера...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3175"/> + <source>Show profiling data for the project.</source> + <translation>Отображает результаты профилирования проекта.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3177"/> <source><b>Profile Data...</b><p>This shows the profiling data for the project.</p></source> <translation><b>Данные профайлера...</b><p>Отображает результаты профилирования проекта.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3257"/> + <location filename="Project/Project.py" line="3262"/> <source>Open &Recent Projects</source> <translation>Открыть &недавние проекты</translation> </message> <message> - <location filename="Project/Project.py" line="3261"/> - <source>Chec&k</source> - <translation>&Проверки</translation> - </message> - <message> - <location filename="Project/Project.py" line="3263"/> - <source>Sho&w</source> - <translation>По&казать</translation> - </message> - <message> <location filename="Project/Project.py" line="3266"/> + <source>Chec&k</source> + <translation>&Проверки</translation> + </message> + <message> + <location filename="Project/Project.py" line="3268"/> + <source>Sho&w</source> + <translation>По&казать</translation> + </message> + <message> + <location filename="Project/Project.py" line="3271"/> <source>Source &Documentation</source> <translation>&Документация исходников</translation> </message> <message> - <location filename="Project/Project.py" line="3542"/> + <location filename="Project/Project.py" line="3547"/> <source>Search New Files</source> <translation>Поиск новых файлов</translation> </message> <message> - <location filename="Project/Project.py" line="3542"/> + <location filename="Project/Project.py" line="3547"/> <source>There were no new files found to be added.</source> <translation>Не найдено файлов для добавления.</translation> </message> <message> - <location filename="Project/Project.py" line="3680"/> + <location filename="Project/Project.py" line="3685"/> <source>Version Control System</source> <translation>Система контроля версий</translation> </message> <message> - <location filename="Project/Project.py" line="3818"/> + <location filename="Project/Project.py" line="3823"/> <source>There is no main script defined for the current project. Aborting</source> <translation>Для текущего проекта не определён главный сценарий. Отмена</translation> </message> <message> - <location filename="Project/Project.py" line="3258"/> + <location filename="Project/Project.py" line="3263"/> <source>&Version Control</source> <translation>Контроль &версий</translation> </message> <message> - <location filename="Project/Project.py" line="3772"/> + <location filename="Project/Project.py" line="3777"/> <source>Coverage Data</source> <translation>Данные охвата</translation> </message> <message> - <location filename="Project/Project.py" line="3892"/> + <location filename="Project/Project.py" line="3897"/> <source>Application Diagram</source> <translation>Диаграмма приложения</translation> </message> <message> - <location filename="Project/Project.py" line="3179"/> - <source>&Application Diagram...</source> - <translation>&Диаграмма приложения...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3182"/> - <source>Show a diagram of the project.</source> - <translation>Показать диаграмму проекта.</translation> - </message> - <message> <location filename="Project/Project.py" line="3184"/> + <source>&Application Diagram...</source> + <translation>&Диаграмма приложения...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3187"/> + <source>Show a diagram of the project.</source> + <translation>Показать диаграмму проекта.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3189"/> <source><b>Application Diagram...</b><p>This shows a diagram of the project.</p></source> <translation><b>Диаграмма приложения...</b><p>Отображает диаграмму проекта.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3264"/> + <location filename="Project/Project.py" line="3269"/> <source>&Diagrams</source> <translation>&Диаграммы</translation> </message> @@ -27576,37 +27634,37 @@ <translation>Сохранить файл проекта</translation> </message> <message> - <location filename="Project/Project.py" line="3793"/> + <location filename="Project/Project.py" line="3798"/> <source>Code Coverage</source> <translation>Заключения охвата по коду</translation> </message> <message> - <location filename="Project/Project.py" line="3793"/> + <location filename="Project/Project.py" line="3798"/> <source>Please select a coverage file</source> <translation>Пожалуйста, выберите файл для информации охвата</translation> </message> <message> - <location filename="Project/Project.py" line="3839"/> + <location filename="Project/Project.py" line="3844"/> <source>Please select a profile file</source> <translation>Пожалуйста, выберите файл профиля</translation> </message> <message> - <location filename="Project/Project.py" line="2943"/> + <location filename="Project/Project.py" line="2948"/> <source>Add directory to project</source> <translation>Добавить каталог в проект</translation> </message> <message> - <location filename="Project/Project.py" line="2943"/> + <location filename="Project/Project.py" line="2948"/> <source>Add directory...</source> <translation>Добавить каталог...</translation> </message> <message> - <location filename="Project/Project.py" line="2947"/> + <location filename="Project/Project.py" line="2952"/> <source>Add a directory to the current project</source> <translation>Добавить каталог в текущий проект</translation> </message> <message> - <location filename="Project/Project.py" line="2949"/> + <location filename="Project/Project.py" line="2954"/> <source><b>Add directory...</b><p>This opens a dialog for adding a directory to the current project.</p></source> <translation><b>Добавить каталог...</b> <p>Открыть диалог для добавления каталога в текущий проект.</p></translation> @@ -27697,17 +27755,17 @@ <translation><p>Невозможно удалить выбранный файл с сессией: <b>{0}</b>.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3129"/> + <location filename="Project/Project.py" line="3134"/> <source>Delete session</source> <translation>Удалить сессию</translation> </message> <message> - <location filename="Project/Project.py" line="3132"/> + <location filename="Project/Project.py" line="3137"/> <source>Delete the projects session file.</source> <translation>Удалить файл с сессией проекта.</translation> </message> <message> - <location filename="Project/Project.py" line="3133"/> + <location filename="Project/Project.py" line="3138"/> <source><b>Delete session</b><p>This deletes the projects session file</p></source> <translation><b>Удалить сессию</b><p>Удалить файл с сессией проекта</p></translation> </message> @@ -27717,7 +27775,7 @@ <translation>Исходники на Ruby (*.rb);;</translation> </message> <message> - <location filename="Project/Project.py" line="2975"/> + <location filename="Project/Project.py" line="2980"/> <source><b>Search new files...</b><p>This searches for new files (sources, *.ui, *.idl) in the project directory and registered subdirectories.</p></source> <translation><b>Искать новые файлы...</b><p>Поиск новых файлов (исходников, *.ui, *.idl) в каталоге проекта и зарегистрированных подкаталогах.</p></translation> </message> @@ -27732,7 +27790,7 @@ <translation>Другое</translation> </message> <message> - <location filename="Project/Project.py" line="3892"/> + <location filename="Project/Project.py" line="3897"/> <source>Include module names?</source> <translation>Включать имена модулей?</translation> </message> @@ -27797,155 +27855,155 @@ <translation><p>Невозможно удалить файл свойств отладчика <b>{0}</b>.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3037"/> + <location filename="Project/Project.py" line="3042"/> <source>Debugger Properties</source> <translation>Свойства отладчика</translation> </message> <message> - <location filename="Project/Project.py" line="3037"/> + <location filename="Project/Project.py" line="3042"/> <source>Debugger &Properties...</source> <translation>&Свойства отладчика...</translation> </message> <message> - <location filename="Project/Project.py" line="3040"/> + <location filename="Project/Project.py" line="3045"/> <source>Show the debugger properties</source> <translation>Показать свойства отладчика</translation> </message> <message> - <location filename="Project/Project.py" line="3041"/> + <location filename="Project/Project.py" line="3046"/> <source><b>Debugger Properties...</b><p>This shows a dialog to edit project specific debugger settings.</p></source> <translation><b>Свойства отладчика...</b> <p>Показать диалог для редактирования свойств отладчика, специфичных для данного проекта.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3048"/> + <location filename="Project/Project.py" line="3053"/> <source>Load</source> <translation>Загрузить</translation> </message> <message> - <location filename="Project/Project.py" line="3048"/> + <location filename="Project/Project.py" line="3053"/> <source>&Load</source> <translation>&Загрузить</translation> </message> <message> - <location filename="Project/Project.py" line="3051"/> + <location filename="Project/Project.py" line="3056"/> <source>Load the debugger properties</source> <translation>Загрузить свойства отладчика</translation> </message> <message> - <location filename="Project/Project.py" line="3059"/> + <location filename="Project/Project.py" line="3064"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="Project/Project.py" line="3062"/> + <location filename="Project/Project.py" line="3067"/> <source>Save the debugger properties</source> <translation>Сохранить свойства отладчика</translation> </message> <message> - <location filename="Project/Project.py" line="3070"/> + <location filename="Project/Project.py" line="3075"/> <source>Delete</source> <translation>Удалить</translation> </message> <message> - <location filename="Project/Project.py" line="3070"/> + <location filename="Project/Project.py" line="3075"/> <source>&Delete</source> <translation>&Удалить</translation> </message> <message> - <location filename="Project/Project.py" line="3073"/> + <location filename="Project/Project.py" line="3078"/> <source>Delete the debugger properties</source> <translation>Удалить свойства отладчика</translation> </message> <message> - <location filename="Project/Project.py" line="3082"/> + <location filename="Project/Project.py" line="3087"/> <source>Reset</source> <translation>Сбросить</translation> </message> <message> - <location filename="Project/Project.py" line="3082"/> + <location filename="Project/Project.py" line="3087"/> <source>&Reset</source> <translation>&Сбросить</translation> </message> <message> - <location filename="Project/Project.py" line="3085"/> + <location filename="Project/Project.py" line="3090"/> <source>Reset the debugger properties</source> <translation>Сбросить свойства отладчика</translation> </message> <message> - <location filename="Project/Project.py" line="3268"/> + <location filename="Project/Project.py" line="3273"/> <source>Debugger</source> <translation>Отладчик</translation> </message> <message> - <location filename="Project/Project.py" line="3265"/> + <location filename="Project/Project.py" line="3270"/> <source>Session</source> <translation>Сессия</translation> </message> <message> - <location filename="Project/Project.py" line="3052"/> + <location filename="Project/Project.py" line="3057"/> <source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source> <translation><b>Загрузить свойства отладчика</b> <p>Загрузить свойства отладчика, специфичные для данного проекта.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3063"/> + <location filename="Project/Project.py" line="3068"/> <source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source> <translation><b>Сохранить свойства отладчика</b><p>Сохранить свойства отладчика, специфичные для данного проекта.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3074"/> + <location filename="Project/Project.py" line="3079"/> <source><b>Delete Debugger Properties</b><p>This deletes the file containing the project specific debugger settings.</p></source> <translation><b>Удалить свойства отладчика</b><p>Удалить свойства отладчика, специфичные для данного проекта.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3086"/> + <location filename="Project/Project.py" line="3091"/> <source><b>Reset Debugger Properties</b><p>This resets the project specific debugger settings.</p></source> <translation><b>Сбросить свойства отладчика</b><p>Сбросить свойства отладчика, специфичные для данного проекта.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3006"/> + <location filename="Project/Project.py" line="3011"/> <source>Filetype Associations</source> <translation>Ассоциации для типа файла</translation> </message> <message> - <location filename="Project/Project.py" line="3006"/> - <source>Filetype Associations...</source> - <translation>Ассоциации для типа файла...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3009"/> - <source>Show the project filetype associations</source> - <translation>Показать ассоциации типов файлов для проекта</translation> - </message> - <message> <location filename="Project/Project.py" line="3011"/> + <source>Filetype Associations...</source> + <translation>Ассоциации для типа файла...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3014"/> + <source>Show the project filetype associations</source> + <translation>Показать ассоциации типов файлов для проекта</translation> + </message> + <message> + <location filename="Project/Project.py" line="3016"/> <source><b>Filetype Associations...</b><p>This shows a dialog to edit the filetype associations of the project. These associations determine the type (source, form, interface or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.</p></source> <translation><b>Ассоциации типов файлов...</b> <p>Показать диалог для редактирования ассоциаций типов файлов для проекта. Эти ассоциации связывают тип файла (исходник, форма, интерфейс и т.д.) с шаблоном имени. Они используются при добавлении файлов в проект и при поиске новых файлов.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3269"/> + <location filename="Project/Project.py" line="3274"/> <source>Pac&kagers</source> <translation>У&паковщики</translation> </message> <message> - <location filename="Project/Project.py" line="2929"/> + <location filename="Project/Project.py" line="2934"/> <source>Add files to project</source> <translation>Добавить файлы в проект</translation> </message> <message> - <location filename="Project/Project.py" line="2929"/> - <source>Add &files...</source> - <translation>Добавить &файлы...</translation> - </message> - <message> - <location filename="Project/Project.py" line="2933"/> - <source>Add files to the current project</source> - <translation>Добавить файлы в текущий проект</translation> - </message> - <message> <location filename="Project/Project.py" line="2934"/> + <source>Add &files...</source> + <translation>Добавить &файлы...</translation> + </message> + <message> + <location filename="Project/Project.py" line="2938"/> + <source>Add files to the current project</source> + <translation>Добавить файлы в текущий проект</translation> + </message> + <message> + <location filename="Project/Project.py" line="2939"/> <source><b>Add files...</b><p>This opens a dialog for adding files to the current project. The place to add is determined by the file extension.</p></source> <translation><b>Добавить файлы</b> <p>Открывает диалог для добавления файлов в текущий проект. Место добавления определяется расширением файла.</p></translation> @@ -27971,17 +28029,17 @@ <translation>Файлы проектов (*.e4p)</translation> </message> <message> - <location filename="Project/Project.py" line="3256"/> + <location filename="Project/Project.py" line="3261"/> <source>&Project</source> <translation>&Проект</translation> </message> <message> - <location filename="Project/Project.py" line="3371"/> + <location filename="Project/Project.py" line="3376"/> <source>Project</source> <translation>Проект</translation> </message> <message> - <location filename="Project/Project.py" line="3432"/> + <location filename="Project/Project.py" line="3437"/> <source>&Clear</source> <translation>&Очистить</translation> </message> @@ -28011,22 +28069,22 @@ <translation><p>Невозможно записать файл пользовательских настроек <b>{0}</b>.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2994"/> + <location filename="Project/Project.py" line="2999"/> <source>User project properties</source> <translation>Пользовательские настройки проекта</translation> </message> <message> - <location filename="Project/Project.py" line="2994"/> - <source>&User Properties...</source> - <translation>&Пользовательские свойства...</translation> - </message> - <message> - <location filename="Project/Project.py" line="2997"/> - <source>Show the user specific project properties</source> - <translation>Показать пользовательские свойства проекта</translation> - </message> - <message> <location filename="Project/Project.py" line="2999"/> + <source>&User Properties...</source> + <translation>&Пользовательские свойства...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3002"/> + <source>Show the user specific project properties</source> + <translation>Показать пользовательские свойства проекта</translation> + </message> + <message> + <location filename="Project/Project.py" line="3004"/> <source><b>User Properties...</b><p>This shows a dialog to edit the user specific project properties.</p></source> <translation><b>Пользовательские свойства...</b> <p>Отображает диалог для редактирования пользовательских свойств проекта.</p></translation> @@ -28046,47 +28104,47 @@ </translation> </message> <message> - <location filename="Project/Project.py" line="4023"/> + <location filename="Project/Project.py" line="4028"/> <source>Create Package List</source> <translation>Создать список пакетов</translation> </message> <message> - <location filename="Project/Project.py" line="3193"/> + <location filename="Project/Project.py" line="3198"/> <source>Create &Package List</source> <translation>&Создать список пакетов</translation> </message> <message> - <location filename="Project/Project.py" line="4183"/> + <location filename="Project/Project.py" line="4188"/> <source>Create Plugin Archive</source> <translation>Создать архив подключаемого модуля</translation> </message> <message> - <location filename="Project/Project.py" line="3207"/> + <location filename="Project/Project.py" line="3212"/> <source>Create Plugin &Archive</source> <translation>Создать &архив плагина</translation> </message> <message> - <location filename="Project/Project.py" line="3996"/> + <location filename="Project/Project.py" line="4001"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation><p>Файл <b>PKGLIST</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="Project/Project.py" line="4023"/> + <location filename="Project/Project.py" line="4028"/> <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> <translation><p>Невозможно создать файл <b>PKGLIST</b>.</p><p>Причина: {0}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4040"/> + <location filename="Project/Project.py" line="4045"/> <source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source> <translation><p>Файл <b>PKGLIST</b> не существует. Отмена...</p></translation> </message> <message> - <location filename="Project/Project.py" line="4048"/> + <location filename="Project/Project.py" line="4053"/> <source>The project does not have a main script defined. Aborting...</source> <translation>Для текущего проекта не определён главный сценарий. Отмена...</translation> </message> <message> - <location filename="Project/Project.py" line="4060"/> + <location filename="Project/Project.py" line="4065"/> <source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source> <translation><p>Невозможно прочитать файл <b>PKGLIST</b>.</p><p>Причина: {0}</p></translation> </message> @@ -28116,22 +28174,22 @@ <translation><p>Тип проекта <b>{0}</b> уже существует.</p></translation> </message> <message> - <location filename="Project/Project.py" line="4091"/> + <location filename="Project/Project.py" line="4096"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation><p>Невозможно сохранить в архив файл <b>{0}</b>. Игнорируем его.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="3222"/> + <location filename="Project/Project.py" line="3227"/> <source>Create Plugin Archive (Snapshot)</source> <translation>Создать архив плагинов (снимок)</translation> </message> <message> - <location filename="Project/Project.py" line="3222"/> + <location filename="Project/Project.py" line="3227"/> <source>Create Plugin Archive (&Snapshot)</source> <translation>Создать архив плагинов (&снимок)</translation> </message> <message> - <location filename="Project/Project.py" line="4183"/> + <location filename="Project/Project.py" line="4188"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation><p>Невозможно прочитать файл плагина <b>{0}</b>.</p><p>Причина: {1}</p></translation> </message> @@ -28151,32 +28209,32 @@ <translation>Введите образец имени файла для переводов (используйте '%language%' вместо кода языка):</translation> </message> <message> - <location filename="Project/Project.py" line="3671"/> + <location filename="Project/Project.py" line="3676"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Reverting override.</p><p>{1}</p></source> <translation><p>Выбранная VCS <b>{0}</b> не найдена.<br/>Отмена.</p><p>{1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="3680"/> + <location filename="Project/Project.py" line="3685"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Disabling version control.</p><p>{1}</p></source> <translation><p>Выбранная VCS <b>{0}</b> не найдена.<br/>Контроль версий не используется.</p><p>{1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="3021"/> - <source>Lexer Associations</source> - <translation>Ассоциации для лексеров</translation> - </message> - <message> - <location filename="Project/Project.py" line="3021"/> - <source>Lexer Associations...</source> - <translation>Ассоциации для лексеров...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3024"/> - <source>Show the project lexer associations (overriding defaults)</source> - <translation>Показать ассоциации для лексеров</translation> - </message> - <message> <location filename="Project/Project.py" line="3026"/> + <source>Lexer Associations</source> + <translation>Ассоциации для лексеров</translation> + </message> + <message> + <location filename="Project/Project.py" line="3026"/> + <source>Lexer Associations...</source> + <translation>Ассоциации для лексеров...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3029"/> + <source>Show the project lexer associations (overriding defaults)</source> + <translation>Показать ассоциации для лексеров</translation> + </message> + <message> + <location filename="Project/Project.py" line="3031"/> <source><b>Lexer Associations...</b><p>This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.</p></source> <translation><b>Ассоциации для лексеров...</b><p>Показать ассоциации лексеров для проекта. Лексеры используются для подсвечивания текста в редакторе.</p></translation> </message> @@ -28201,42 +28259,42 @@ <translation>Подключаемый модуль Eric</translation> </message> <message> - <location filename="Project/Project.py" line="3197"/> + <location filename="Project/Project.py" line="3202"/> <source>Create an initial PKGLIST file for an eric5 plugin.</source> <translation>Создать начальный файл PKGLIST для подключаемого модуля eric5.</translation> </message> <message> - <location filename="Project/Project.py" line="3199"/> + <location filename="Project/Project.py" line="3204"/> <source><b>Create Package List</b><p>This creates an initial list of files to include in an eric5 plugin archive. The list is created from the project file.</p></source> <translation><b>Создать список пакетов</b><p>Создаёт начальный список файлов для включения в архив подключаемого модуля eric5. Список создаётся из файла проекта.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3211"/> + <location filename="Project/Project.py" line="3216"/> <source>Create an eric5 plugin archive file.</source> <translation>Создать архив подключаемого модуля eric5.</translation> </message> <message> - <location filename="Project/Project.py" line="3213"/> + <location filename="Project/Project.py" line="3218"/> <source><b>Create Plugin Archive</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name.</p></source> <translation><b>Создать архив подключаемого модуля</b><p>Создаёт файл арива подключаемого модуля eric5, используя список файлов, данный в файле PKGLIST. Имя архива берётся из имени главного сценария.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3226"/> + <location filename="Project/Project.py" line="3231"/> <source>Create an eric5 plugin archive file (snapshot release).</source> <translation>Создать файл архива плагинов eric5 (снимок выпуска).</translation> </message> <message> - <location filename="Project/Project.py" line="3228"/> + <location filename="Project/Project.py" line="3233"/> <source><b>Create Plugin Archive (Snapshot)</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name. The version entry of the main script is modified to reflect a snapshot release.</p></source> <translation><b>Создать файл архива плагинов (снимок выпуска)</b><p>Создаёт файл архива плагинов eric5, используя список файлов, указанный в файле PKGLIST. Имя архива строится из имени главного сценария. Версия главного сценария меняется, чтобы соответствовать версии выпуска снимка.</p></translation> </message> <message> - <location filename="Project/Project.py" line="4071"/> + <location filename="Project/Project.py" line="4076"/> <source><p>The eric5 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation><p>Невозможно создать подключаемый модуль eric5 <b>{0}</b>.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4103"/> + <location filename="Project/Project.py" line="4108"/> <source><p>The eric5 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation><p>Подключаемый модуль <b>{0}</b> был успешно создан.</p></translation> </message> @@ -29919,22 +29977,22 @@ <context> <name>Purge</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="91"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="97"/> <source>Purge All Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="98"/> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="101"/> <source>Purge Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="102"/> <source>Do really want to delete files not tracked by Mercurial?</source> <translation type="unfinished"></translation> </message> @@ -31949,177 +32007,177 @@ <context> <name>Queues</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="256"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="276"/> <source>New Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="325"/> <source>Update Current Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="356"/> - <source>Pop Patches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="360"/> - <source>Push Patches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="364"/> - <source>Go to Patch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> - <source>Select Patch</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="376"/> + <source>Pop Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="380"/> + <source>Push Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="384"/> + <source>Go to Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="515"/> + <source>Select Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="396"/> <source>Select the target patch name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="515"/> <source>No patches to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="447"/> <source>Finish Applied Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="459"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="479"/> <source>Rename Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="501"/> <source>Select the patch to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="490"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="510"/> <source>Delete Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="535"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="555"/> <source>Fold Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="551"/> <source>No patches selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="535"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="555"/> <source>No patches available to be folded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="559"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="579"/> <source>List Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="559"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="579"/> <source>No patches available to list guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="594"/> - <source>Define Guards</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> - <source>No patches available to define guards for.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> - <source>Drop All Guards</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="614"/> + <source>Define Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <source>No patches available to define guards for.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <source>Drop All Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="634"/> <source>Select the patch to drop guards for (leave empty for the current patch):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="693"/> <source>Set Active Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="693"/> <source>No guards available to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="691"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="715"/> <source>Deactivate Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="753"/> <source>Create New Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="755"/> <source>Rename Active Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="757"/> - <source>Error while creating a new queue.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/> - <source>Error while renaming the active queue.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="787"/> - <source>Purge Queue</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="789"/> + <source>Error while creating a new queue.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="792"/> + <source>Error while renaming the active queue.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="819"/> + <source>Purge Queue</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="821"/> <source>Delete Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="823"/> <source>Activate Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="820"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="860"/> <source>Error while purging the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="862"/> <source>Error while deleting the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="864"/> <source>Error while setting the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="847"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="887"/> <source>Available Queues</source> <translation type="unfinished"></translation> </message> @@ -49025,17 +49083,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1668"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Метки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1676"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Ветви</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1683"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -49046,30 +49104,30 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1566"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1662"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Изменения</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1680"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1168"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Предок #{0}</b></td><td></td></tr> <tr><td><b>Изменения</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1116"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1184"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -49079,7 +49137,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1214"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49096,7 +49154,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_tr.ts Wed Aug 31 19:28:49 2011 +0200 +++ b/i18n/eric5_tr.ts Wed Aug 31 19:35:11 2011 +0200 @@ -1378,62 +1378,62 @@ <context> <name>Bookmarks</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="129"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="147"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="147"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="159"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="187"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="220"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="304"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="304"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="316"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="337"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="337"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="334"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="349"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -15620,250 +15620,265 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="234"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> <source>Create project repository</source> <translation>Bilgi havuzu projesi oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> - <source>Creating Mercurial repository</source> - <translation>Mercurial kaynak havauzu oluşturuluyor</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> + <source>Creating Mercurial repository</source> + <translation>Mercurial kaynak havauzu oluşturuluyor</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="331"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="351"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="427"/> - <source>Commiting changes to Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="475"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="523"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="558"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="622"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="686"/> <source>Renaming {0}</source> <translation>Yenşden adlandırılıyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="746"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="791"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="776"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/> <source>Reverting changes</source> <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="869"/> <source>Merging</source> <translation>Birleştiriliyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1047"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> <source>Mercurial command</source> <translation>Mercurial komut</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1224"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1298"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> <source>Mercurial Log</source> <translation>Mercurial Günlüğü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> <source>Select number of entries to show.</source> <translation>Gösterilecek giriş sayısını seçiniz.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1477"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> <source>Pulling from a remote Mercurial repository</source> <translation>Uzak Mercurial kaynak havuzundan çekiliyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1509"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1599"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source>Create Branch</source> <translation>Sınıf(Branş) Oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source>Enter branch name</source> <translation>Sınıf(Branş) adını gir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1656"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1679"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1736"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1856"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p><b>{0}</b> dosyası halihazırda bulunuyor. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Değiştirme grubu Dosyaları (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2098"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Değişimgrubu Dosyaları (*.hg);;Tüm Dosyalar (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2006"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2108"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> - <source>Mercurial Bisect ({0})</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> - <source>Removing files from the Mercurial repository only</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> - <source>Backing out changeset</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <source>Mercurial Bisect ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2225"/> + <source>Removing files from the Mercurial repository only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2281"/> + <source>Backing out changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2024"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2306"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="454"/> + <source>Committing changes to Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <source>Mercurial Command Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2344"/> + <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -15943,12 +15958,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="110"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="110"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <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> @@ -16321,17 +16336,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> <source>Process Generation Error</source> <translation type="unfinished">İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="165"/> <source>no bookmarks found</source> <translation type="unfinished"></translation> </message> @@ -16421,17 +16436,17 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> <source>Process Generation Error</source> <translation type="unfinished">İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="150"/> <source>no bookmarks defined</source> <translation type="unfinished"></translation> </message> @@ -16550,6 +16565,44 @@ </message> </context> <context> + <name>HgClient</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="76"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="117"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="119"/> + <source>Received data on unexpected channel.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="124"/> + <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="128"/> + <source>'capabilities' message did not contain any capability.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="136"/> + <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <source>'encoding' message did not contain any encoding.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/> @@ -16763,12 +16816,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> <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> @@ -16836,27 +16889,27 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/> <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> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="206"/> <source>There is no difference.</source> <translation>Herhangi bir farklılık bulunamadı.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="347"/> <source>Save Diff</source> <translation>Farklılıkları Kaydet</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="316"/> <source>Patch Files (*.diff)</source> <translation>Patch Dosyaları (*.diff)</translation> </message> @@ -16866,17 +16919,17 @@ <translation type="obsolete"><p>Yama dosyası <b>{0}</b> zaten var.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="347"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p><b>{0}</b>yama kaydedilemedi.<br>Sebep: {1}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="289"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="333"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Yama dosyası <b>{0}</b> zaten var. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="109"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="112"/> <source>Patch Contents</source> <translation type="unfinished"></translation> </message> @@ -17075,7 +17128,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="310"/> <source>Revision</source> <translation type="unfinished">Gözden Geçirme</translation> </message> @@ -17150,17 +17203,17 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> <source>Process Generation Error</source> <translation type="unfinished">İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="147"/> <source>no signatures found</source> <translation type="unfinished"></translation> </message> @@ -17198,17 +17251,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1082"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/> <source>Revision</source> <translation>Gözden Geçirme</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1079"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1128"/> <source>Author</source> <translation>Yazar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> <source>Message</source> <translation>Mesaj</translation> </message> @@ -17358,42 +17411,42 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> <source>Added</source> <translation>Eklendi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="116"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Deleted</source> <translation>Silindi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> <source>Modified</source> <translation>Değiştirildi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="492"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="476"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> <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> @@ -17418,12 +17471,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/> <source>All</source> <translation>Hepsi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> <source>Bookmarks</source> <translation type="unfinished">Yerimleri</translation> </message> @@ -17511,106 +17564,106 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="55"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="56"/> <source><b>Processing your request, please wait...</b></source> <translation><b>İsteğiniz yerine getirilyor, lütfen bekleyiniz...</b></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="66"/> <source>Revision</source> <translation>Gözden Geçirme</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> <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> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="201"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="226"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="228"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="231"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="259"/> <source>No log available for '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="258"/> - <source>diff to {0}</source> - <translation>{0}ne farkı</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> - <source>Branches: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="268"/> - <source>Tags: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/> - <source>Parents: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="275"/> - <source><i>Author: {0}</i><br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="278"/> - <source><i>Date: {0}, {1}</i><br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="288"/> - <source>Added {0} (copied from {1})<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> + <source>diff to {0}</source> + <translation>{0}ne farkı</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> + <source>Branches: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="302"/> + <source>Tags: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/> + <source>Parents: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> + <source><i>Author: {0}</i><br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <source><i>Date: {0}, {1}</i><br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> + <source>Added {0} (copied from {1})<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> <source>Added {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> <source>Modified {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="338"/> <source>Deleted {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="271"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> @@ -19055,37 +19108,37 @@ <translation type="unfinished">Kaldır</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> <source>Unsaved Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> <source>Remove Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> <source>Do you really want to remove the selected guards?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> <source>Apply Guard Definitions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/> <source>The Mercurial process did not finish in time.</source> <translation type="unfinished"></translation> </message> @@ -19159,17 +19212,17 @@ <translation type="unfinished">Teslimat mesajı</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> <source>Process Generation Error</source> <translation type="unfinished">İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="189"/> <source>Error: </source> <translation type="unfinished"></translation> </message> @@ -19187,12 +19240,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="89"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="103"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="94"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> @@ -19277,42 +19330,42 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> <source>Process Generation Error</source> <translation type="unfinished">İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="219"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="50"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> <source>applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> - <source>guarded</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="53"/> + <source>guarded</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="54"/> <source>missing</source> <translation type="unfinished">kayıp</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="292"/> <source>unknown</source> <translation type="unfinished">bilinmeyen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> <source>not applied</source> <translation type="unfinished"></translation> </message> @@ -19350,7 +19403,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="111"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="122"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> @@ -19471,12 +19524,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="60"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="62"/> <source>Refresh</source> <translation type="unfinished">Tazele</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="62"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="64"/> <source>Press to refresh the queues list</source> <translation type="unfinished"></translation> </message> @@ -19984,7 +20037,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="188"/> <source>Mercurial Status</source> <translation>Mercurial Durumu</translation> </message> @@ -20061,107 +20114,107 @@ <translation>Durum göstergesini yenilemek için bas</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="62"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="63"/> <source>Commit changes to repository...</source> <translation>Yapılan değişiklekleri kaynak havuzuna teslim et...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/> <source>Add to repository</source> <translation>Kaynak havuzuna ekle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="69"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="70"/> <source>Remove from repository</source> <translation>Kaynak havuzundan kaldır</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="71"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="72"/> <source>Revert changes</source> <translation>Değişiklikleri başa döndür</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="76"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="77"/> <source>Adjust column sizes</source> <translation>Sütün boyutunu ayarla</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> - <source>added</source> - <translation>eklendi</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> - <source>modified</source> - <translation>değiştirildi</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> - <source>removed</source> - <translation>kaldırılmış</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> - <source>not tracked</source> - <translation>izlenmedi</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> - <source>missing</source> - <translation>kayıp</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> - <source>normal</source> - <translation>normal</translation> + <source>added</source> + <translation>eklendi</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> + <source>modified</source> + <translation>değiştirildi</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> + <source>removed</source> + <translation>kaldırılmış</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> + <source>not tracked</source> + <translation>izlenmedi</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <source>missing</source> + <translation>kayıp</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> + <source>normal</source> + <translation>normal</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> <source>ignored</source> <translation>yoksayıldı</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="238"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="238"/> <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> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="540"/> <source>Commit</source> <translation>Teslimat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="642"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="567"/> <source>Add</source> <translation>Ekle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="567"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="588"/> <source>Remove</source> <translation>Kaldır</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="625"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="625"/> <source>Revert</source> <translation>Başa Dönme</translation> </message> @@ -20236,17 +20289,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="68"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="74"/> <source>Restore missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="452"/> <source>all</source> <translation type="unfinished"></translation> </message> @@ -20256,12 +20309,12 @@ <translation type="obsolete">Farklılık</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="642"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="540"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> @@ -20269,12 +20322,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="153"/> <source>Mercurial status checked successfully</source> <translation>Mercurial durumu başarılı olarak kontrol edildi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="119"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="100"/> <source>Could not start the Mercurial process.</source> <translation>Mercurial işlemleri başlatılamadı.</translation> </message> @@ -20366,32 +20419,32 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="86"/> <source>Mercurial Branches List</source> <translation>Mercurial Branş Listesi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="87"/> <source>Status</source> <translation>Durum</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> <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> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="247"/> <source>active</source> <translation>aktif</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="252"/> <source>yes</source> <translation>evet</translation> </message> @@ -27677,7 +27730,7 @@ <translation>VCS komut seçeneklerini düzenlemek istiyor musunuz?</translation> </message> <message> - <location filename="Project/Project.py" line="2869"/> + <location filename="Project/Project.py" line="2874"/> <source>New project</source> <translation>Yeni Proje</translation> </message> @@ -27707,7 +27760,7 @@ <translation>Çeviri dosylarınınyol kalıbını giriniz (kullanılan '% dil %'dil kodu):</translation> </message> <message> - <location filename="Project/Project.py" line="2882"/> + <location filename="Project/Project.py" line="2887"/> <source>Open project</source> <translation>Projeyi aç</translation> </message> @@ -27727,7 +27780,7 @@ <translation>Proje Dosyaları (*.e4p)</translation> </message> <message> - <location filename="Project/Project.py" line="2916"/> + <location filename="Project/Project.py" line="2921"/> <source>Save project as</source> <translation>projeyi farklı adda kaydet</translation> </message> @@ -27770,687 +27823,687 @@ </translation> </message> <message> - <location filename="Project/Project.py" line="2869"/> + <location filename="Project/Project.py" line="2874"/> <source>&New...</source> <translation>Ye&ni...</translation> </message> <message> - <location filename="Project/Project.py" line="2873"/> + <location filename="Project/Project.py" line="2878"/> <source>Generate a new project</source> <translation>Yeni bir proje üret</translation> </message> <message> - <location filename="Project/Project.py" line="2874"/> + <location filename="Project/Project.py" line="2879"/> <source><b>New...</b><p>This opens a dialog for entering the info for a new project.</p></source> <translation><b>Yeni...</b><p>Bu yeni bir proje için bilgilerin girileceği bir diyalog açar.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2882"/> - <source>&Open...</source> - <translation>&Aç...</translation> - </message> - <message> - <location filename="Project/Project.py" line="2886"/> - <source>Open an existing project</source> - <translation>Var olan bir projeyi aç</translation> - </message> - <message> <location filename="Project/Project.py" line="2887"/> + <source>&Open...</source> + <translation>&Aç...</translation> + </message> + <message> + <location filename="Project/Project.py" line="2891"/> + <source>Open an existing project</source> + <translation>Var olan bir projeyi aç</translation> + </message> + <message> + <location filename="Project/Project.py" line="2892"/> <source><b>Open...</b><p>This opens an existing project.</p></source> <translation><b>Aç...</b><p>Bu varolan bir projeyi açar.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2894"/> + <location filename="Project/Project.py" line="2899"/> <source>Close project</source> <translation>Projeyi kapat</translation> </message> <message> - <location filename="Project/Project.py" line="2894"/> + <location filename="Project/Project.py" line="2899"/> <source>&Close</source> <translation>&Kapat</translation> </message> <message> - <location filename="Project/Project.py" line="2897"/> + <location filename="Project/Project.py" line="2902"/> <source>Close the current project</source> <translation>Geçerli projeyi kapat</translation> </message> <message> - <location filename="Project/Project.py" line="2898"/> + <location filename="Project/Project.py" line="2903"/> <source><b>Close</b><p>This closes the current project.</p></source> <translation><b>Kapat</b><p>Bu geçerli projeyi kapatır.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2905"/> + <location filename="Project/Project.py" line="2910"/> <source>Save project</source> <translation>Projeyi kaydet</translation> </message> <message> - <location filename="Project/Project.py" line="3059"/> + <location filename="Project/Project.py" line="3064"/> <source>&Save</source> <translation>&Kaydet</translation> </message> <message> - <location filename="Project/Project.py" line="2908"/> + <location filename="Project/Project.py" line="2913"/> <source>Save the current project</source> <translation>Geçerli projeyi kapat</translation> </message> <message> - <location filename="Project/Project.py" line="2909"/> + <location filename="Project/Project.py" line="2914"/> <source><b>Save</b><p>This saves the current project.</p></source> <translation><b>Kaydet</b><p>Bu geçerli projeyi kaydeder.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2916"/> + <location filename="Project/Project.py" line="2921"/> <source>Save &as...</source> <translation>Farklı k&aydet...</translation> </message> <message> - <location filename="Project/Project.py" line="2919"/> + <location filename="Project/Project.py" line="2924"/> <source>Save the current project to a new file</source> <translation>Geçerli projeyi yeni bir dosya olarak kaydet</translation> </message> <message> - <location filename="Project/Project.py" line="2920"/> + <location filename="Project/Project.py" line="2925"/> <source><b>Save as</b><p>This saves the current project to a new file.</p></source> <translation><b>Farklı kaydet</b><p>Bu geçerli projeyi yeni bir dosya olarak kaydeder.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2929"/> + <location filename="Project/Project.py" line="2934"/> <source>Add files to project</source> <translation>Projeye dosyalar ekle</translation> </message> <message> - <location filename="Project/Project.py" line="2929"/> - <source>Add &files...</source> - <translation>Dosyaları &ekle...</translation> - </message> - <message> - <location filename="Project/Project.py" line="2933"/> - <source>Add files to the current project</source> - <translation>Geçerli projeye dosyalar ekle</translation> - </message> - <message> <location filename="Project/Project.py" line="2934"/> + <source>Add &files...</source> + <translation>Dosyaları &ekle...</translation> + </message> + <message> + <location filename="Project/Project.py" line="2938"/> + <source>Add files to the current project</source> + <translation>Geçerli projeye dosyalar ekle</translation> + </message> + <message> + <location filename="Project/Project.py" line="2939"/> <source><b>Add files...</b><p>This opens a dialog for adding files to the current project. The place to add is determined by the file extension.</p></source> <translation><b>Dosya ekle...</b><p>Bu geçerli projeye bir dosya eklemek için bir diyalog açar. Alana belirlenmiş uzantıda bir dosya eklenir.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2943"/> + <location filename="Project/Project.py" line="2948"/> <source>Add directory to project</source> <translation>Projeye dizin ekle</translation> </message> <message> - <location filename="Project/Project.py" line="2943"/> + <location filename="Project/Project.py" line="2948"/> <source>Add directory...</source> <translation>Dizin ekle...</translation> </message> <message> - <location filename="Project/Project.py" line="2947"/> + <location filename="Project/Project.py" line="2952"/> <source>Add a directory to the current project</source> <translation>Geçerli projeye bir dizin ekleyiniz</translation> </message> <message> - <location filename="Project/Project.py" line="2949"/> + <location filename="Project/Project.py" line="2954"/> <source><b>Add directory...</b><p>This opens a dialog for adding a directory to the current project.</p></source> <translation><b>Dizin Ekle...</b><p>Bu geçerli projeye bir dizin eklemek için bir diyalog açar.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2957"/> + <location filename="Project/Project.py" line="2962"/> <source>Add translation to project</source> <translation>Projeye çeviri ekle</translation> </message> <message> - <location filename="Project/Project.py" line="2957"/> + <location filename="Project/Project.py" line="2962"/> <source>Add &translation...</source> <translation>Çeviri &ekle...</translation> </message> <message> - <location filename="Project/Project.py" line="2961"/> + <location filename="Project/Project.py" line="2966"/> <source>Add a translation to the current project</source> <translation>Geçerli projeye çeviri ekle</translation> </message> <message> - <location filename="Project/Project.py" line="2963"/> + <location filename="Project/Project.py" line="2968"/> <source><b>Add translation...</b><p>This opens a dialog for add a translation to the current project.</p></source> <translation><b>Çeviri ekle...</b><p>Bu geçerli projeye bir çeviri eklemek için bir diyalog açar.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2971"/> + <location filename="Project/Project.py" line="2976"/> <source>Search new files</source> <translation>Yeni dosyaları ara</translation> </message> <message> - <location filename="Project/Project.py" line="2971"/> + <location filename="Project/Project.py" line="2976"/> <source>Searc&h new files...</source> <translation>Yeni dosyaları a&ra...</translation> </message> <message> - <location filename="Project/Project.py" line="2974"/> + <location filename="Project/Project.py" line="2979"/> <source>Search new files in the project directory.</source> <translation>Proje dizininde yeni dosyaları ara.</translation> </message> <message> - <location filename="Project/Project.py" line="2975"/> + <location filename="Project/Project.py" line="2980"/> <source><b>Search new files...</b><p>This searches for new files (sources, *.ui, *.idl) in the project directory and registered subdirectories.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2983"/> + <location filename="Project/Project.py" line="2988"/> <source>Project properties</source> <translation>Proje özellikleri</translation> </message> <message> - <location filename="Project/Project.py" line="2983"/> + <location filename="Project/Project.py" line="2988"/> <source>&Properties...</source> <translation>&Özellikler...</translation> </message> <message> - <location filename="Project/Project.py" line="2986"/> + <location filename="Project/Project.py" line="2991"/> <source>Show the project properties</source> <translation>Proje özelliklerini göster</translation> </message> <message> - <location filename="Project/Project.py" line="2987"/> + <location filename="Project/Project.py" line="2992"/> <source><b>Properties...</b><p>This shows a dialog to edit the project properties.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="2994"/> - <source>User project properties</source> - <translation>Kullanıcı projesi özellikleri</translation> - </message> - <message> - <location filename="Project/Project.py" line="2994"/> - <source>&User Properties...</source> - <translation>K&ullanıcı Özellikleri...</translation> - </message> - <message> - <location filename="Project/Project.py" line="2997"/> - <source>Show the user specific project properties</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Project/Project.py" line="2999"/> + <source>User project properties</source> + <translation>Kullanıcı projesi özellikleri</translation> + </message> + <message> + <location filename="Project/Project.py" line="2999"/> + <source>&User Properties...</source> + <translation>K&ullanıcı Özellikleri...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3002"/> + <source>Show the user specific project properties</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3004"/> <source><b>User Properties...</b><p>This shows a dialog to edit the user specific project properties.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3006"/> - <source>Filetype Associations</source> - <translation>Dosyatipi Birleştirme</translation> - </message> - <message> - <location filename="Project/Project.py" line="3006"/> - <source>Filetype Associations...</source> - <translation>Dosyatipi Birleştirme...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3009"/> - <source>Show the project filetype associations</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Project/Project.py" line="3011"/> + <source>Filetype Associations</source> + <translation>Dosyatipi Birleştirme</translation> + </message> + <message> + <location filename="Project/Project.py" line="3011"/> + <source>Filetype Associations...</source> + <translation>Dosyatipi Birleştirme...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3014"/> + <source>Show the project filetype associations</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3016"/> <source><b>Filetype Associations...</b><p>This shows a dialog to edit the filetype associations of the project. These associations determine the type (source, form, interface or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3021"/> + <location filename="Project/Project.py" line="3026"/> <source>Lexer Associations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3021"/> - <source>Lexer Associations...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Project/Project.py" line="3024"/> - <source>Show the project lexer associations (overriding defaults)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Project/Project.py" line="3026"/> + <source>Lexer Associations...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3029"/> + <source>Show the project lexer associations (overriding defaults)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3031"/> <source><b>Lexer Associations...</b><p>This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3037"/> + <location filename="Project/Project.py" line="3042"/> <source>Debugger Properties</source> <translation>Hata Ayıklayıcı Özellikleri</translation> </message> <message> - <location filename="Project/Project.py" line="3037"/> + <location filename="Project/Project.py" line="3042"/> <source>Debugger &Properties...</source> <translation>Hata Ayıklayıcı &Özellikleri...</translation> </message> <message> - <location filename="Project/Project.py" line="3040"/> + <location filename="Project/Project.py" line="3045"/> <source>Show the debugger properties</source> <translation>Hata ayıklayıcı özelliklerini göster</translation> </message> <message> - <location filename="Project/Project.py" line="3041"/> + <location filename="Project/Project.py" line="3046"/> <source><b>Debugger Properties...</b><p>This shows a dialog to edit project specific debugger settings.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3048"/> + <location filename="Project/Project.py" line="3053"/> <source>Load</source> <translation>Yükle</translation> </message> <message> - <location filename="Project/Project.py" line="3048"/> + <location filename="Project/Project.py" line="3053"/> <source>&Load</source> <translation>Yük&le</translation> </message> <message> - <location filename="Project/Project.py" line="3051"/> + <location filename="Project/Project.py" line="3056"/> <source>Load the debugger properties</source> <translation>Hata ayıklayıcı özelliklerini yükle</translation> </message> <message> - <location filename="Project/Project.py" line="3052"/> + <location filename="Project/Project.py" line="3057"/> <source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3059"/> + <location filename="Project/Project.py" line="3064"/> <source>Save</source> <translation>Kaydet</translation> </message> <message> - <location filename="Project/Project.py" line="3062"/> + <location filename="Project/Project.py" line="3067"/> <source>Save the debugger properties</source> <translation>Hata ayıklayıcı özelliklerini kaydet</translation> </message> <message> - <location filename="Project/Project.py" line="3063"/> + <location filename="Project/Project.py" line="3068"/> <source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3070"/> + <location filename="Project/Project.py" line="3075"/> <source>Delete</source> <translation>Sil</translation> </message> <message> - <location filename="Project/Project.py" line="3070"/> + <location filename="Project/Project.py" line="3075"/> <source>&Delete</source> <translation>&Sil</translation> </message> <message> - <location filename="Project/Project.py" line="3073"/> + <location filename="Project/Project.py" line="3078"/> <source>Delete the debugger properties</source> <translation>Hata ayıklayıcı özelliklerini sil</translation> </message> <message> - <location filename="Project/Project.py" line="3074"/> + <location filename="Project/Project.py" line="3079"/> <source><b>Delete Debugger Properties</b><p>This deletes the file containing the project specific debugger settings.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3082"/> + <location filename="Project/Project.py" line="3087"/> <source>Reset</source> <translation>Başadön</translation> </message> <message> - <location filename="Project/Project.py" line="3082"/> + <location filename="Project/Project.py" line="3087"/> <source>&Reset</source> <translation>Başad&ön</translation> </message> <message> - <location filename="Project/Project.py" line="3085"/> + <location filename="Project/Project.py" line="3090"/> <source>Reset the debugger properties</source> <translation>Hata ayıklayıcı özelliklerini başa döndür</translation> </message> <message> - <location filename="Project/Project.py" line="3086"/> + <location filename="Project/Project.py" line="3091"/> <source><b>Reset Debugger Properties</b><p>This resets the project specific debugger settings.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3095"/> + <location filename="Project/Project.py" line="3100"/> <source>Load session</source> <translation>Oturum yükleniyor</translation> </message> <message> - <location filename="Project/Project.py" line="3098"/> + <location filename="Project/Project.py" line="3103"/> <source>Load the projects session file.</source> <translation>Projelerin oturm dosyasını yükle.</translation> </message> <message> - <location filename="Project/Project.py" line="3099"/> + <location filename="Project/Project.py" line="3104"/> <source><b>Load session</b><p>This loads the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3112"/> + <location filename="Project/Project.py" line="3117"/> <source>Save session</source> <translation>Oturumu kaydet</translation> </message> <message> - <location filename="Project/Project.py" line="3115"/> + <location filename="Project/Project.py" line="3120"/> <source>Save the projects session file.</source> <translation>Proje oturum dosyasını kaydet.</translation> </message> <message> - <location filename="Project/Project.py" line="3116"/> + <location filename="Project/Project.py" line="3121"/> <source><b>Save session</b><p>This saves the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3129"/> + <location filename="Project/Project.py" line="3134"/> <source>Delete session</source> <translation>Oturumu sil</translation> </message> <message> - <location filename="Project/Project.py" line="3132"/> + <location filename="Project/Project.py" line="3137"/> <source>Delete the projects session file.</source> <translation>Proje oturum dosyasını sil.</translation> </message> <message> - <location filename="Project/Project.py" line="3133"/> + <location filename="Project/Project.py" line="3138"/> <source><b>Delete session</b><p>This deletes the projects session file</p></source> <translation><b>Oturumu Sil</b><p>Bu proje dosya oturumunu siler</p></translation> </message> <message> - <location filename="Project/Project.py" line="3142"/> - <source>Code Metrics</source> - <translation>Metrik Kod</translation> - </message> - <message> - <location filename="Project/Project.py" line="3142"/> - <source>&Code Metrics...</source> - <translation>Me&trik Kod...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3145"/> - <source>Show some code metrics for the project.</source> - <translation>Proje için bazı metrik kodları göster.</translation> - </message> - <message> <location filename="Project/Project.py" line="3147"/> + <source>Code Metrics</source> + <translation>Metrik Kod</translation> + </message> + <message> + <location filename="Project/Project.py" line="3147"/> + <source>&Code Metrics...</source> + <translation>Me&trik Kod...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3150"/> + <source>Show some code metrics for the project.</source> + <translation>Proje için bazı metrik kodları göster.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3152"/> <source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source> <translation><b>Metrik Kodlar...</b><p>Bu proje içindeki tüm Python dosyalarının bazı metrik kodlarını gösterir.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3154"/> + <location filename="Project/Project.py" line="3159"/> <source>Python Code Coverage</source> <translation>Python Kod Koruyucu</translation> </message> <message> - <location filename="Project/Project.py" line="3154"/> - <source>Code Co&verage...</source> - <translation>Kod Koru&yucu...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3157"/> - <source>Show code coverage information for the project.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Project/Project.py" line="3159"/> + <source>Code Co&verage...</source> + <translation>Kod Koru&yucu...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3162"/> + <source>Show code coverage information for the project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3164"/> <source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3839"/> + <location filename="Project/Project.py" line="3844"/> <source>Profile Data</source> <translation>Veri Kesiti</translation> </message> <message> - <location filename="Project/Project.py" line="3167"/> - <source>&Profile Data...</source> - <translation>&Veri kesiti...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3170"/> - <source>Show profiling data for the project.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Project/Project.py" line="3172"/> + <source>&Profile Data...</source> + <translation>&Veri kesiti...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3175"/> + <source>Show profiling data for the project.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3177"/> <source><b>Profile Data...</b><p>This shows the profiling data for the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3892"/> + <location filename="Project/Project.py" line="3897"/> <source>Application Diagram</source> <translation>Uygulama Şeması</translation> </message> <message> - <location filename="Project/Project.py" line="3179"/> - <source>&Application Diagram...</source> - <translation>Uygulama Şem&ası...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3182"/> - <source>Show a diagram of the project.</source> - <translation>Projenin bir şemasını göster.</translation> - </message> - <message> <location filename="Project/Project.py" line="3184"/> + <source>&Application Diagram...</source> + <translation>Uygulama Şem&ası...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3187"/> + <source>Show a diagram of the project.</source> + <translation>Projenin bir şemasını göster.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3189"/> <source><b>Application Diagram...</b><p>This shows a diagram of the project.</p></source> <translation><b>Uygulama Şeması...</b><p>Bu projenin bir şemasını gösterir.</p></translation> </message> <message> - <location filename="Project/Project.py" line="4023"/> + <location filename="Project/Project.py" line="4028"/> <source>Create Package List</source> <translation>Paket Listesini Oluştur</translation> </message> <message> - <location filename="Project/Project.py" line="3193"/> + <location filename="Project/Project.py" line="3198"/> <source>Create &Package List</source> <translation>&Paket Listesini Üret</translation> </message> <message> - <location filename="Project/Project.py" line="3197"/> + <location filename="Project/Project.py" line="3202"/> <source>Create an initial PKGLIST file for an eric5 plugin.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3199"/> + <location filename="Project/Project.py" line="3204"/> <source><b>Create Package List</b><p>This creates an initial list of files to include in an eric5 plugin archive. The list is created from the project file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4183"/> + <location filename="Project/Project.py" line="4188"/> <source>Create Plugin Archive</source> <translation>Eklenti Arşivi Oluştur</translation> </message> <message> - <location filename="Project/Project.py" line="3207"/> + <location filename="Project/Project.py" line="3212"/> <source>Create Plugin &Archive</source> <translation>Eklenti &Arşivi Oluştur</translation> </message> <message> - <location filename="Project/Project.py" line="3211"/> + <location filename="Project/Project.py" line="3216"/> <source>Create an eric5 plugin archive file.</source> <translation>Eric5 eklenti arşiv dosyası oluştur.</translation> </message> <message> - <location filename="Project/Project.py" line="3213"/> + <location filename="Project/Project.py" line="3218"/> <source><b>Create Plugin Archive</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3222"/> + <location filename="Project/Project.py" line="3227"/> <source>Create Plugin Archive (Snapshot)</source> <translation>Eklenti arşivi oluştur (Şipşak)</translation> </message> <message> - <location filename="Project/Project.py" line="3222"/> + <location filename="Project/Project.py" line="3227"/> <source>Create Plugin Archive (&Snapshot)</source> <translation>Eklenti Arşivi Oluştur (En&stantene)</translation> </message> <message> - <location filename="Project/Project.py" line="3226"/> + <location filename="Project/Project.py" line="3231"/> <source>Create an eric5 plugin archive file (snapshot release).</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3228"/> + <location filename="Project/Project.py" line="3233"/> <source><b>Create Plugin Archive (Snapshot)</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name. The version entry of the main script is modified to reflect a snapshot release.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3256"/> - <source>&Project</source> - <translation>&Proje</translation> - </message> - <message> - <location filename="Project/Project.py" line="3257"/> - <source>Open &Recent Projects</source> - <translation>Geçmiş P&rojeleri Aç</translation> - </message> - <message> - <location filename="Project/Project.py" line="3258"/> - <source>&Version Control</source> - <translation>S&ürüm Kontrol</translation> - </message> - <message> <location filename="Project/Project.py" line="3261"/> - <source>Chec&k</source> - <translation>&Kontrol</translation> + <source>&Project</source> + <translation>&Proje</translation> + </message> + <message> + <location filename="Project/Project.py" line="3262"/> + <source>Open &Recent Projects</source> + <translation>Geçmiş P&rojeleri Aç</translation> </message> <message> <location filename="Project/Project.py" line="3263"/> - <source>Sho&w</source> - <translation>G&öster</translation> - </message> - <message> - <location filename="Project/Project.py" line="3264"/> - <source>&Diagrams</source> - <translation>Şemalar &D</translation> - </message> - <message> - <location filename="Project/Project.py" line="3265"/> - <source>Session</source> - <translation>Oturum</translation> + <source>&Version Control</source> + <translation>S&ürüm Kontrol</translation> </message> <message> <location filename="Project/Project.py" line="3266"/> - <source>Source &Documentation</source> - <translation>Kaynak Belgeleme &D</translation> + <source>Chec&k</source> + <translation>&Kontrol</translation> </message> <message> <location filename="Project/Project.py" line="3268"/> - <source>Debugger</source> - <translation>Hata Ayıklayıcı</translation> + <source>Sho&w</source> + <translation>G&öster</translation> </message> <message> <location filename="Project/Project.py" line="3269"/> + <source>&Diagrams</source> + <translation>Şemalar &D</translation> + </message> + <message> + <location filename="Project/Project.py" line="3270"/> + <source>Session</source> + <translation>Oturum</translation> + </message> + <message> + <location filename="Project/Project.py" line="3271"/> + <source>Source &Documentation</source> + <translation>Kaynak Belgeleme &D</translation> + </message> + <message> + <location filename="Project/Project.py" line="3273"/> + <source>Debugger</source> + <translation>Hata Ayıklayıcı</translation> + </message> + <message> + <location filename="Project/Project.py" line="3274"/> <source>Pac&kagers</source> <translation>Pa&ketleyici</translation> </message> <message> - <location filename="Project/Project.py" line="3371"/> + <location filename="Project/Project.py" line="3376"/> <source>Project</source> <translation>Proje</translation> </message> <message> - <location filename="Project/Project.py" line="3432"/> + <location filename="Project/Project.py" line="3437"/> <source>&Clear</source> <translation>T&emizle</translation> </message> <message> - <location filename="Project/Project.py" line="3542"/> + <location filename="Project/Project.py" line="3547"/> <source>Search New Files</source> <translation>Yeni Dosyaları Ara</translation> </message> <message> - <location filename="Project/Project.py" line="3542"/> + <location filename="Project/Project.py" line="3547"/> <source>There were no new files found to be added.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3680"/> + <location filename="Project/Project.py" line="3685"/> <source>Version Control System</source> <translation>Sürüm Kontrol Sistemi</translation> </message> <message> - <location filename="Project/Project.py" line="3671"/> + <location filename="Project/Project.py" line="3676"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Reverting override.</p><p>{1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3680"/> + <location filename="Project/Project.py" line="3685"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Disabling version control.</p><p>{1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3772"/> + <location filename="Project/Project.py" line="3777"/> <source>Coverage Data</source> <translation>Veri Kapsamı</translation> </message> <message> - <location filename="Project/Project.py" line="3818"/> + <location filename="Project/Project.py" line="3823"/> <source>There is no main script defined for the current project. Aborting</source> <translation>Bugeçerli projede tanımlanan ana betik değil. Durduruluyor</translation> </message> <message> - <location filename="Project/Project.py" line="3793"/> + <location filename="Project/Project.py" line="3798"/> <source>Code Coverage</source> <translation>Kod Koruyucu</translation> </message> <message> - <location filename="Project/Project.py" line="3793"/> + <location filename="Project/Project.py" line="3798"/> <source>Please select a coverage file</source> <translation>Lütfen bir koruyucu dosya seçiniz</translation> </message> <message> - <location filename="Project/Project.py" line="3839"/> + <location filename="Project/Project.py" line="3844"/> <source>Please select a profile file</source> <translation>Lütfen kesit dosyasını seçiniz</translation> </message> <message> - <location filename="Project/Project.py" line="3892"/> + <location filename="Project/Project.py" line="3897"/> <source>Include module names?</source> <translation>Modül isimleri dahil edilsin mi?</translation> </message> <message> - <location filename="Project/Project.py" line="3996"/> + <location filename="Project/Project.py" line="4001"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4023"/> + <location filename="Project/Project.py" line="4028"/> <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4040"/> + <location filename="Project/Project.py" line="4045"/> <source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4048"/> + <location filename="Project/Project.py" line="4053"/> <source>The project does not have a main script defined. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4060"/> + <location filename="Project/Project.py" line="4065"/> <source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4071"/> + <location filename="Project/Project.py" line="4076"/> <source><p>The eric5 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4091"/> + <location filename="Project/Project.py" line="4096"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4103"/> + <location filename="Project/Project.py" line="4108"/> <source><p>The eric5 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4183"/> + <location filename="Project/Project.py" line="4188"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -30130,22 +30183,22 @@ <context> <name>Purge</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="91"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="97"/> <source>Purge All Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="98"/> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="101"/> <source>Purge Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="102"/> <source>Do really want to delete files not tracked by Mercurial?</source> <translation type="unfinished"></translation> </message> @@ -32131,177 +32184,177 @@ <context> <name>Queues</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="256"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="276"/> <source>New Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="325"/> <source>Update Current Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="356"/> - <source>Pop Patches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="360"/> - <source>Push Patches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="364"/> - <source>Go to Patch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> - <source>Select Patch</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="376"/> + <source>Pop Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="380"/> + <source>Push Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="384"/> + <source>Go to Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="515"/> + <source>Select Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="396"/> <source>Select the target patch name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="515"/> <source>No patches to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="447"/> <source>Finish Applied Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="459"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="479"/> <source>Rename Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="501"/> <source>Select the patch to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="490"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="510"/> <source>Delete Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="535"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="555"/> <source>Fold Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="551"/> <source>No patches selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="535"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="555"/> <source>No patches available to be folded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="559"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="579"/> <source>List Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="559"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="579"/> <source>No patches available to list guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="594"/> - <source>Define Guards</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> - <source>No patches available to define guards for.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> - <source>Drop All Guards</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="614"/> + <source>Define Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <source>No patches available to define guards for.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <source>Drop All Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="634"/> <source>Select the patch to drop guards for (leave empty for the current patch):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="693"/> <source>Set Active Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="693"/> <source>No guards available to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="691"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="715"/> <source>Deactivate Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="753"/> <source>Create New Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="755"/> <source>Rename Active Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="757"/> - <source>Error while creating a new queue.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/> - <source>Error while renaming the active queue.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="787"/> - <source>Purge Queue</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="789"/> + <source>Error while creating a new queue.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="792"/> + <source>Error while renaming the active queue.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="819"/> + <source>Purge Queue</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="821"/> <source>Delete Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="823"/> <source>Activate Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="820"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="860"/> <source>Error while purging the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="862"/> <source>Error while deleting the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="864"/> <source>Error while setting the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="847"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="887"/> <source>Available Queues</source> <translation type="unfinished"></translation> </message> @@ -49123,24 +49176,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1168"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Esas #{0}</b></td><td></td></tr> <tr><td><b>Değişiklik seti</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1668"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiketler</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1676"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branşlar</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1116"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1184"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -49149,7 +49202,7 @@ <tr><td><b>Teslim zamnanı</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1214"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49166,23 +49219,23 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1566"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1662"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>İp ucu</b></td><td></td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>DEğişiklik seti</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1680"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Esas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1683"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -49193,7 +49246,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Wed Aug 31 19:28:49 2011 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Wed Aug 31 19:35:11 2011 +0200 @@ -1557,62 +1557,62 @@ <context> <name>Bookmarks</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="122"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="129"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="147"/> <source>Delete Bookmark</source> <translation type="unfinished">删除书签</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="147"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="159"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="187"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="220"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="304"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="304"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="316"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="337"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="337"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="334"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="349"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> @@ -16737,250 +16737,265 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="234"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="262"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> - <source>Creating Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="290"/> + <source>Creating Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="305"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="331"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="351"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="427"/> - <source>Commiting changes to Mercurial repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="475"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="506"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="523"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="558"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="622"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="686"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="746"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="791"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="776"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/> <source>Reverting changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="869"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1047"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1108"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1224"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1298"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/> <source>Select number of entries to show.</source> <translation type="unfinished">选择要显示的条目数。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1477"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1567"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1509"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1599"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1739"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1656"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1750"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1736"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1856"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1879"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1806"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1902"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2134"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1679"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1774"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2145"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2057"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2091"/> - <source>Mercurial Bisect ({0})</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/> - <source>Preview changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> - <source>Identifying project directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> - <source>Create .hgignore file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1854"/> - <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> - <source>Removing files from the Mercurial repository only</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> - <source>Mercurial Changegroup Files (*.hg)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> - <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2006"/> - <source>Identifying changegroup file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/> - <source>Backing out changeset</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2193"/> + <source>Mercurial Bisect ({0})</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2098"/> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <source>Identifying project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <source>Create .hgignore file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1956"/> + <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2225"/> + <source>Removing files from the Mercurial repository only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2108"/> + <source>Identifying changegroup file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2281"/> + <source>Backing out changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2261"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1922"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2024"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2306"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="454"/> + <source>Committing changes to Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <source>Mercurial Command Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2344"/> + <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2457"/> + <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -17060,12 +17075,12 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="110"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="110"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="132"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -17438,17 +17453,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="133"/> <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/BookmarksExtension/HgBookmarksInOutDialog.py" line="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="165"/> <source>no bookmarks found</source> <translation type="unfinished"></translation> </message> @@ -17538,17 +17553,17 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="118"/> <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/BookmarksExtension/HgBookmarksListDialog.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="150"/> <source>no bookmarks defined</source> <translation type="unfinished"></translation> </message> @@ -17667,6 +17682,44 @@ </message> </context> <context> + <name>HgClient</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="76"/> + <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/HgClient.py" line="117"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="119"/> + <source>Received data on unexpected channel.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="124"/> + <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="128"/> + <source>'capabilities' message did not contain any capability.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="136"/> + <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <source>'encoding' message did not contain any encoding.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/> @@ -17880,12 +17933,12 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="134"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="140"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -17953,42 +18006,42 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/> <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/HgDiffDialog.py" line="178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="206"/> <source>There is no difference.</source> <translation type="unfinished">没有差异。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="347"/> <source>Save Diff</source> <translation type="unfinished">保存差异</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="316"/> <source>Patch Files (*.diff)</source> <translation type="unfinished">补丁文件 (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="347"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="289"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="333"/> <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/HgDiffDialog.py" line="109"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="112"/> <source>Patch Contents</source> <translation type="unfinished"></translation> </message> @@ -18187,7 +18240,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="310"/> <source>Revision</source> <translation type="unfinished">修订</translation> </message> @@ -18262,17 +18315,17 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="115"/> <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/GpgExtension/HgGpgSignaturesDialog.py" line="128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="147"/> <source>no signatures found</source> <translation type="unfinished"></translation> </message> @@ -18310,17 +18363,17 @@ <translation type="unfinished">选择要过滤的区域</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1082"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1131"/> <source>Revision</source> <translation type="unfinished">修订</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1079"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1128"/> <source>Author</source> <translation type="unfinished">作者</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="93"/> <source>Message</source> <translation type="unfinished">消息</translation> </message> @@ -18460,42 +18513,42 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> <source>Added</source> <translation type="unfinished">已添加</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="116"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Deleted</source> <translation type="unfinished">已删除</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/> <source>Modified</source> <translation type="unfinished">已修改</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="680"/> <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="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="489"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="473"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="492"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="476"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="495"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -18535,7 +18588,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/> <source>All</source> <translation type="unfinished">全部</translation> </message> @@ -18550,7 +18603,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="130"/> <source>Bookmarks</source> <translation type="unfinished">书签</translation> </message> @@ -18638,106 +18691,106 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="55"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="56"/> <source><b>Processing your request, please wait...</b></source> <translation type="unfinished"><b>正在处理您的请求,请稍候……</b></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="66"/> <source>Revision</source> <translation type="unfinished">修订</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="176"/> <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/HgLogDialog.py" line="225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="259"/> <source>No log available for '{0}'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="258"/> - <source>diff to {0}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="266"/> - <source>Branches: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="268"/> - <source>Tags: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="273"/> - <source>Parents: {0}<br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="275"/> - <source><i>Author: {0}</i><br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="278"/> - <source><i>Date: {0}, {1}</i><br /> -</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="292"/> + <source>diff to {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> + <source>Branches: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="302"/> + <source>Tags: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="307"/> + <source>Parents: {0}<br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> + <source><i>Author: {0}</i><br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <source><i>Date: {0}, {1}</i><br /> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> <source>Added {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> <source>Modified {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="338"/> <source>Deleted {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="201"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="226"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="228"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="231"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="288"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> <source>Added {0} (copied from {1})<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="271"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> @@ -20192,37 +20245,37 @@ <translation type="unfinished">移除</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> <source>Unsaved Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="111"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> <source>Remove Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="233"/> <source>Do you really want to remove the selected guards?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> <source>Apply Guard Definitions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="299"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="293"/> <source>The Mercurial process did not finish in time.</source> <translation type="unfinished"></translation> </message> @@ -20296,17 +20349,17 @@ <translation type="unfinished">提交消息</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="86"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="102"/> <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/QueuesExtension/HgQueuesHeaderDialog.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="189"/> <source>Error: </source> <translation type="unfinished"></translation> </message> @@ -20324,12 +20377,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="89"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="103"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="94"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> @@ -20414,42 +20467,42 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="187"/> <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/QueuesExtension/HgQueuesListDialog.py" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="219"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="50"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> <source>applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> - <source>guarded</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="53"/> + <source>guarded</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="54"/> <source>missing</source> <translation type="unfinished">遗漏</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="292"/> <source>unknown</source> <translation type="unfinished">未知</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> <source>not applied</source> <translation type="unfinished"></translation> </message> @@ -20487,7 +20540,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="111"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="122"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> @@ -20608,12 +20661,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="60"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="62"/> <source>Refresh</source> <translation type="unfinished">刷新</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="62"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="64"/> <source>Press to refresh the queues list</source> <translation type="unfinished"></translation> </message> @@ -21121,7 +21174,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="188"/> <source>Mercurial Status</source> <translation type="unfinished"></translation> </message> @@ -21197,107 +21250,107 @@ <translation type="unfinished">点击刷新状态显示</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="62"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="63"/> <source>Commit changes to repository...</source> <translation type="unfinished">将更改提交到储存库中……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="65"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="66"/> <source>Add to repository</source> <translation type="unfinished">添加到储存库</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="71"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="72"/> <source>Revert changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="76"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="77"/> <source>Adjust column sizes</source> <translation type="unfinished">调整列宽</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>added</source> <translation type="unfinished">已添加</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> - <source>modified</source> - <translation type="unfinished">已修改</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> - <source>removed</source> - <translation type="unfinished"></translation> + <source>modified</source> + <translation type="unfinished">已修改</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="104"/> - <source>not tracked</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> - <source>normal</source> - <translation type="unfinished">标准</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> - <source>ignored</source> - <translation type="unfinished">已忽略</translation> + <source>removed</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="105"/> + <source>not tracked</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> + <source>normal</source> + <translation type="unfinished">标准</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="102"/> + <source>ignored</source> + <translation type="unfinished">已忽略</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> <source>missing</source> <translation type="unfinished">遗漏</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="238"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="238"/> <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/HgStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="540"/> <source>Commit</source> <translation type="unfinished">提交</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="642"/> <source>There are no uncommitted changes available/selected.</source> <translation type="unfinished">没有未提交的更改可用或被选择。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="567"/> <source>Add</source> <translation type="unfinished">添加</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="567"/> <source>There are no unversioned entries available/selected.</source> <translation type="unfinished">没有未版本化的条目可用或被选择。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="625"/> <source>Revert</source> <translation type="unfinished">还原</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="69"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="70"/> <source>Remove from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="588"/> <source>Remove</source> <translation type="unfinished">移除</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="625"/> <source>There are no missing entries available/selected.</source> <translation type="unfinished"></translation> </message> @@ -21372,17 +21425,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="68"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="73"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="74"/> <source>Restore missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="452"/> <source>all</source> <translation type="unfinished"></translation> </message> @@ -21392,12 +21445,12 @@ <translation type="obsolete">差异</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="604"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="642"/> <source>Differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="502"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="540"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> @@ -21405,12 +21458,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="153"/> <source>Mercurial status checked successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="119"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="100"/> <source>Could not start the Mercurial process.</source> <translation type="unfinished"></translation> </message> @@ -21501,32 +21554,32 @@ <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="86"/> <source>Mercurial Branches List</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="87"/> <source>Status</source> <translation type="unfinished">状态</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> <source>Process Generation Error</source> <translation type="unfinished">进程生成错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="131"/> <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/HgTagBranchListDialog.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="247"/> <source>active</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="252"/> <source>yes</source> <translation type="unfinished">是</translation> </message> @@ -29465,7 +29518,7 @@ <translation>是否编辑版本控制系统命令选项?</translation> </message> <message> - <location filename="Project/Project.py" line="2869"/> + <location filename="Project/Project.py" line="2874"/> <source>New project</source> <translation>新建项目</translation> </message> @@ -29505,7 +29558,7 @@ <translation type="obsolete"><p>项目文件的 <b>%1</b> 条目包含安全问题。</p></translation> </message> <message> - <location filename="Project/Project.py" line="2882"/> + <location filename="Project/Project.py" line="2887"/> <source>Open project</source> <translation>打开项目</translation> </message> @@ -29525,7 +29578,7 @@ <translation>项目文件 (*.e4p)</translation> </message> <message> - <location filename="Project/Project.py" line="2916"/> + <location filename="Project/Project.py" line="2921"/> <source>Save project as</source> <translation>项目另存为</translation> </message> @@ -29567,427 +29620,427 @@ </translation> </message> <message> - <location filename="Project/Project.py" line="2869"/> + <location filename="Project/Project.py" line="2874"/> <source>&New...</source> <translation>新建(&N)……</translation> </message> <message> - <location filename="Project/Project.py" line="2873"/> + <location filename="Project/Project.py" line="2878"/> <source>Generate a new project</source> <translation>生成新项目</translation> </message> <message> - <location filename="Project/Project.py" line="2874"/> + <location filename="Project/Project.py" line="2879"/> <source><b>New...</b><p>This opens a dialog for entering the info for a new project.</p></source> <translation><b>新建……</b><p>打开一个对话框为新项目输入信息。</p></translation> </message> <message> - <location filename="Project/Project.py" line="2882"/> - <source>&Open...</source> - <translation>打开(&O)……</translation> - </message> - <message> - <location filename="Project/Project.py" line="2886"/> - <source>Open an existing project</source> - <translation>打开一个已有项目</translation> - </message> - <message> <location filename="Project/Project.py" line="2887"/> + <source>&Open...</source> + <translation>打开(&O)……</translation> + </message> + <message> + <location filename="Project/Project.py" line="2891"/> + <source>Open an existing project</source> + <translation>打开一个已有项目</translation> + </message> + <message> + <location filename="Project/Project.py" line="2892"/> <source><b>Open...</b><p>This opens an existing project.</p></source> <translation><b>打开……</b><p>打开一个已有项目。</p></translation> </message> <message> - <location filename="Project/Project.py" line="2894"/> + <location filename="Project/Project.py" line="2899"/> <source>Close project</source> <translation>关闭项目</translation> </message> <message> - <location filename="Project/Project.py" line="2894"/> + <location filename="Project/Project.py" line="2899"/> <source>&Close</source> <translation>关闭(&C)</translation> </message> <message> - <location filename="Project/Project.py" line="2897"/> + <location filename="Project/Project.py" line="2902"/> <source>Close the current project</source> <translation>关闭当前项目</translation> </message> <message> - <location filename="Project/Project.py" line="2898"/> + <location filename="Project/Project.py" line="2903"/> <source><b>Close</b><p>This closes the current project.</p></source> <translation><b>关闭</b><p>关闭当前项目。</p></translation> </message> <message> - <location filename="Project/Project.py" line="2905"/> + <location filename="Project/Project.py" line="2910"/> <source>Save project</source> <translation>保存项目</translation> </message> <message> - <location filename="Project/Project.py" line="3059"/> + <location filename="Project/Project.py" line="3064"/> <source>&Save</source> <translation>保存(&S)</translation> </message> <message> - <location filename="Project/Project.py" line="2908"/> + <location filename="Project/Project.py" line="2913"/> <source>Save the current project</source> <translation>保存当前项目</translation> </message> <message> - <location filename="Project/Project.py" line="2909"/> + <location filename="Project/Project.py" line="2914"/> <source><b>Save</b><p>This saves the current project.</p></source> <translation><b>保存</b><p>保存当前项目</p></translation> </message> <message> - <location filename="Project/Project.py" line="2916"/> + <location filename="Project/Project.py" line="2921"/> <source>Save &as...</source> <translation>另存为(&a)……</translation> </message> <message> - <location filename="Project/Project.py" line="2919"/> + <location filename="Project/Project.py" line="2924"/> <source>Save the current project to a new file</source> <translation>将当前项目另存为一个新文件</translation> </message> <message> - <location filename="Project/Project.py" line="2920"/> + <location filename="Project/Project.py" line="2925"/> <source><b>Save as</b><p>This saves the current project to a new file.</p></source> <translation><b>另存为</b><p>将当前项目另存为一个新文件。</p></translation> </message> <message> - <location filename="Project/Project.py" line="2929"/> + <location filename="Project/Project.py" line="2934"/> <source>Add files to project</source> <translation>将文件添加到项目中</translation> </message> <message> - <location filename="Project/Project.py" line="2929"/> - <source>Add &files...</source> - <translation>添加文件(&f)……</translation> - </message> - <message> - <location filename="Project/Project.py" line="2933"/> - <source>Add files to the current project</source> - <translation>将文件添加到当前项目中</translation> - </message> - <message> <location filename="Project/Project.py" line="2934"/> + <source>Add &files...</source> + <translation>添加文件(&f)……</translation> + </message> + <message> + <location filename="Project/Project.py" line="2938"/> + <source>Add files to the current project</source> + <translation>将文件添加到当前项目中</translation> + </message> + <message> + <location filename="Project/Project.py" line="2939"/> <source><b>Add files...</b><p>This opens a dialog for adding files to the current project. The place to add is determined by the file extension.</p></source> <translation><b>添加文件……</b><p>打开一个对话框为当前项目添加文件。添加的位置由文件扩展名决定。</p></translation> </message> <message> - <location filename="Project/Project.py" line="2943"/> + <location filename="Project/Project.py" line="2948"/> <source>Add directory to project</source> <translation>将文件夹添加到项目中</translation> </message> <message> - <location filename="Project/Project.py" line="2943"/> + <location filename="Project/Project.py" line="2948"/> <source>Add directory...</source> <translation>添加文件夹……</translation> </message> <message> - <location filename="Project/Project.py" line="2947"/> + <location filename="Project/Project.py" line="2952"/> <source>Add a directory to the current project</source> <translation>为当前工程添加文件夹</translation> </message> <message> - <location filename="Project/Project.py" line="2949"/> + <location filename="Project/Project.py" line="2954"/> <source><b>Add directory...</b><p>This opens a dialog for adding a directory to the current project.</p></source> <translation><b>添加文件夹……</b><p>打开一个对话框将文件夹添加到当前项目中。</p></translation> </message> <message> - <location filename="Project/Project.py" line="2957"/> + <location filename="Project/Project.py" line="2962"/> <source>Add translation to project</source> <translation>将翻译添加到项目中</translation> </message> <message> - <location filename="Project/Project.py" line="2957"/> + <location filename="Project/Project.py" line="2962"/> <source>Add &translation...</source> <translation>添加翻译(&t)……</translation> </message> <message> - <location filename="Project/Project.py" line="2961"/> + <location filename="Project/Project.py" line="2966"/> <source>Add a translation to the current project</source> <translation>将翻译添加到当前项目中</translation> </message> <message> - <location filename="Project/Project.py" line="2963"/> + <location filename="Project/Project.py" line="2968"/> <source><b>Add translation...</b><p>This opens a dialog for add a translation to the current project.</p></source> <translation><b>添加翻译……</b><p>打开一个对话框将翻译添加到当前项目中。</p></translation> </message> <message> - <location filename="Project/Project.py" line="2971"/> + <location filename="Project/Project.py" line="2976"/> <source>Search new files</source> <translation>搜索新文件</translation> </message> <message> - <location filename="Project/Project.py" line="2971"/> + <location filename="Project/Project.py" line="2976"/> <source>Searc&h new files...</source> <translation>搜索(&h)新文件……</translation> </message> <message> - <location filename="Project/Project.py" line="2974"/> + <location filename="Project/Project.py" line="2979"/> <source>Search new files in the project directory.</source> <translation>在项目文件夹中搜索新文件。</translation> </message> <message> - <location filename="Project/Project.py" line="2975"/> + <location filename="Project/Project.py" line="2980"/> <source><b>Search new files...</b><p>This searches for new files (sources, *.ui, *.idl) in the project directory and registered subdirectories.</p></source> <translation><b>搜索新文件……</b><p>在项目文件夹和注册的子文件夹中搜索新文件(源文件, *.ui, *.idl) 。</p></translation> </message> <message> - <location filename="Project/Project.py" line="2983"/> + <location filename="Project/Project.py" line="2988"/> <source>Project properties</source> <translation>项目属性</translation> </message> <message> - <location filename="Project/Project.py" line="2983"/> + <location filename="Project/Project.py" line="2988"/> <source>&Properties...</source> <translation>属性(&P)……</translation> </message> <message> - <location filename="Project/Project.py" line="2986"/> + <location filename="Project/Project.py" line="2991"/> <source>Show the project properties</source> <translation>显示项目属性</translation> </message> <message> - <location filename="Project/Project.py" line="2987"/> + <location filename="Project/Project.py" line="2992"/> <source><b>Properties...</b><p>This shows a dialog to edit the project properties.</p></source> <translation><b>属性……</b><p>显示一个对话框可编辑项目属性。</p></translation> </message> <message> - <location filename="Project/Project.py" line="2994"/> + <location filename="Project/Project.py" line="2999"/> <source>User project properties</source> <translation>用户项目属性</translation> </message> <message> - <location filename="Project/Project.py" line="2994"/> - <source>&User Properties...</source> - <translation>用户(&U)属性……</translation> - </message> - <message> - <location filename="Project/Project.py" line="2997"/> - <source>Show the user specific project properties</source> - <translation>显示用户指定的项目属性</translation> - </message> - <message> <location filename="Project/Project.py" line="2999"/> + <source>&User Properties...</source> + <translation>用户(&U)属性……</translation> + </message> + <message> + <location filename="Project/Project.py" line="3002"/> + <source>Show the user specific project properties</source> + <translation>显示用户指定的项目属性</translation> + </message> + <message> + <location filename="Project/Project.py" line="3004"/> <source><b>User Properties...</b><p>This shows a dialog to edit the user specific project properties.</p></source> <translation><b>用户属性……</b><p>显示一个对话框可编辑用户指定的项目属性。</p></translation> </message> <message> - <location filename="Project/Project.py" line="3006"/> + <location filename="Project/Project.py" line="3011"/> <source>Filetype Associations</source> <translation>文件类型关联</translation> </message> <message> - <location filename="Project/Project.py" line="3006"/> - <source>Filetype Associations...</source> - <translation>文件类型关联……</translation> - </message> - <message> - <location filename="Project/Project.py" line="3009"/> - <source>Show the project filetype associations</source> - <translation>显示项目文件类型关联</translation> - </message> - <message> <location filename="Project/Project.py" line="3011"/> + <source>Filetype Associations...</source> + <translation>文件类型关联……</translation> + </message> + <message> + <location filename="Project/Project.py" line="3014"/> + <source>Show the project filetype associations</source> + <translation>显示项目文件类型关联</translation> + </message> + <message> + <location filename="Project/Project.py" line="3016"/> <source><b>Filetype Associations...</b><p>This shows a dialog to edit the filetype associations of the project. These associations determine the type (source, form, interface or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.</p></source> <translation><b>文件类型关联……</b><p>显示一个对话框可编辑项目的文件类型关联。这些关联以文件名样式决定类型(源代码、窗体、界面或其它)。在把一个文件添加到项目中和搜索新文件时使用。</p></translation> </message> <message> - <location filename="Project/Project.py" line="3037"/> + <location filename="Project/Project.py" line="3042"/> <source>Debugger Properties</source> <translation>调试器属性</translation> </message> <message> - <location filename="Project/Project.py" line="3037"/> + <location filename="Project/Project.py" line="3042"/> <source>Debugger &Properties...</source> <translation>调试器属性(&P)……</translation> </message> <message> - <location filename="Project/Project.py" line="3040"/> + <location filename="Project/Project.py" line="3045"/> <source>Show the debugger properties</source> <translation>显示调试器属性</translation> </message> <message> - <location filename="Project/Project.py" line="3041"/> + <location filename="Project/Project.py" line="3046"/> <source><b>Debugger Properties...</b><p>This shows a dialog to edit project specific debugger settings.</p></source> <translation><b>调试器属性……</b><p>显示一个对话框以编辑项目指定的调试器设定。</p></translation> </message> <message> - <location filename="Project/Project.py" line="3048"/> + <location filename="Project/Project.py" line="3053"/> <source>Load</source> <translation>载入</translation> </message> <message> - <location filename="Project/Project.py" line="3048"/> + <location filename="Project/Project.py" line="3053"/> <source>&Load</source> <translation>载入(&L)</translation> </message> <message> - <location filename="Project/Project.py" line="3051"/> + <location filename="Project/Project.py" line="3056"/> <source>Load the debugger properties</source> <translation>载入调试器属性</translation> </message> <message> - <location filename="Project/Project.py" line="3052"/> + <location filename="Project/Project.py" line="3057"/> <source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source> <translation><b>载入调试器属性</b><p>载入项目指定的调试器设定。</p></translation> </message> <message> - <location filename="Project/Project.py" line="3059"/> + <location filename="Project/Project.py" line="3064"/> <source>Save</source> <translation>保存</translation> </message> <message> - <location filename="Project/Project.py" line="3062"/> + <location filename="Project/Project.py" line="3067"/> <source>Save the debugger properties</source> <translation>保存调试器属性</translation> </message> <message> - <location filename="Project/Project.py" line="3063"/> + <location filename="Project/Project.py" line="3068"/> <source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source> <translation><b>保存调试器属性</b><p>保存项目指定的调试器设置。</p></translation> </message> <message> - <location filename="Project/Project.py" line="3070"/> + <location filename="Project/Project.py" line="3075"/> <source>Delete</source> <translation>删除</translation> </message> <message> - <location filename="Project/Project.py" line="3070"/> + <location filename="Project/Project.py" line="3075"/> <source>&Delete</source> <translation>删除(&D)</translation> </message> <message> - <location filename="Project/Project.py" line="3073"/> + <location filename="Project/Project.py" line="3078"/> <source>Delete the debugger properties</source> <translation>删除调试器属性</translation> </message> <message> - <location filename="Project/Project.py" line="3074"/> + <location filename="Project/Project.py" line="3079"/> <source><b>Delete Debugger Properties</b><p>This deletes the file containing the project specific debugger settings.</p></source> <translation><b>删除调试器属性</b><p>删除包含项目指定调试器设置的文件。</p></translation> </message> <message> - <location filename="Project/Project.py" line="3082"/> + <location filename="Project/Project.py" line="3087"/> <source>Reset</source> <translation>重置</translation> </message> <message> - <location filename="Project/Project.py" line="3082"/> + <location filename="Project/Project.py" line="3087"/> <source>&Reset</source> <translation>重置(&R)</translation> </message> <message> - <location filename="Project/Project.py" line="3085"/> + <location filename="Project/Project.py" line="3090"/> <source>Reset the debugger properties</source> <translation>重围调试器属性</translation> </message> <message> - <location filename="Project/Project.py" line="3086"/> + <location filename="Project/Project.py" line="3091"/> <source><b>Reset Debugger Properties</b><p>This resets the project specific debugger settings.</p></source> <translation><b>重置调试器属性</b><p>重置项目指定的调试器设置。</p></translation> </message> <message> - <location filename="Project/Project.py" line="3095"/> + <location filename="Project/Project.py" line="3100"/> <source>Load session</source> <translation>载入会话</translation> </message> <message> - <location filename="Project/Project.py" line="3098"/> + <location filename="Project/Project.py" line="3103"/> <source>Load the projects session file.</source> <translation>载入项目会话文件。</translation> </message> <message> - <location filename="Project/Project.py" line="3099"/> + <location filename="Project/Project.py" line="3104"/> <source><b>Load session</b><p>This loads the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>载入会话</b><p>载入项目会话文件。会话包括如下数据。<br>- 所有打开的源文件<br>- 所有断点<br>- 命令行参数<br>- 工作文件夹<br>- 异常报告标志</p></translation> </message> <message> - <location filename="Project/Project.py" line="3112"/> + <location filename="Project/Project.py" line="3117"/> <source>Save session</source> <translation>保存会话</translation> </message> <message> - <location filename="Project/Project.py" line="3115"/> + <location filename="Project/Project.py" line="3120"/> <source>Save the projects session file.</source> <translation>保存项目会话文件。</translation> </message> <message> - <location filename="Project/Project.py" line="3116"/> + <location filename="Project/Project.py" line="3121"/> <source><b>Save session</b><p>This saves the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>保存会话</b><p>保存项目会话文件。会话包括如下数据。<br>- 所有打开的源文件<br>- 所有断点<br>- 命令行参数<br>- 工作文件夹<br>- 异常报告标志</p></translation> </message> <message> - <location filename="Project/Project.py" line="3129"/> + <location filename="Project/Project.py" line="3134"/> <source>Delete session</source> <translation>删除会话</translation> </message> <message> - <location filename="Project/Project.py" line="3132"/> + <location filename="Project/Project.py" line="3137"/> <source>Delete the projects session file.</source> <translation>删除项目会话文件。</translation> </message> <message> - <location filename="Project/Project.py" line="3133"/> + <location filename="Project/Project.py" line="3138"/> <source><b>Delete session</b><p>This deletes the projects session file</p></source> <translation><b>删除会话</b><p>删除项目会话文件</p></translation> </message> <message> - <location filename="Project/Project.py" line="3142"/> - <source>Code Metrics</source> - <translation>代码度量</translation> - </message> - <message> - <location filename="Project/Project.py" line="3142"/> - <source>&Code Metrics...</source> - <translation>代码度量(&C)……</translation> - </message> - <message> - <location filename="Project/Project.py" line="3145"/> - <source>Show some code metrics for the project.</source> - <translation>显示项目的部分代码度量。</translation> - </message> - <message> <location filename="Project/Project.py" line="3147"/> + <source>Code Metrics</source> + <translation>代码度量</translation> + </message> + <message> + <location filename="Project/Project.py" line="3147"/> + <source>&Code Metrics...</source> + <translation>代码度量(&C)……</translation> + </message> + <message> + <location filename="Project/Project.py" line="3150"/> + <source>Show some code metrics for the project.</source> + <translation>显示项目的部分代码度量。</translation> + </message> + <message> + <location filename="Project/Project.py" line="3152"/> <source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source> <translation><b>代码度量……</b><p>显示项目中所有 Python 文件的部分代码度量。</p></translation> </message> <message> - <location filename="Project/Project.py" line="3154"/> + <location filename="Project/Project.py" line="3159"/> <source>Python Code Coverage</source> <translation>Python 代码覆盖率</translation> </message> <message> - <location filename="Project/Project.py" line="3154"/> - <source>Code Co&verage...</source> - <translation>代码覆盖率(&v)……</translation> - </message> - <message> - <location filename="Project/Project.py" line="3157"/> - <source>Show code coverage information for the project.</source> - <translation>显示项目的代码覆盖率信息。</translation> - </message> - <message> <location filename="Project/Project.py" line="3159"/> + <source>Code Co&verage...</source> + <translation>代码覆盖率(&v)……</translation> + </message> + <message> + <location filename="Project/Project.py" line="3162"/> + <source>Show code coverage information for the project.</source> + <translation>显示项目的代码覆盖率信息。</translation> + </message> + <message> + <location filename="Project/Project.py" line="3164"/> <source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source> <translation><b>代码覆盖率……</b><p>显示项目中所有 Python 文件的代码覆盖率。</p></translation> </message> <message> - <location filename="Project/Project.py" line="3839"/> + <location filename="Project/Project.py" line="3844"/> <source>Profile Data</source> <translation>剖析数据</translation> </message> <message> - <location filename="Project/Project.py" line="3167"/> - <source>&Profile Data...</source> - <translation>剖析数据(&P)……</translation> - </message> - <message> - <location filename="Project/Project.py" line="3170"/> - <source>Show profiling data for the project.</source> - <translation>显示项目的剖析数据。</translation> - </message> - <message> <location filename="Project/Project.py" line="3172"/> + <source>&Profile Data...</source> + <translation>剖析数据(&P)……</translation> + </message> + <message> + <location filename="Project/Project.py" line="3175"/> + <source>Show profiling data for the project.</source> + <translation>显示项目的剖析数据。</translation> + </message> + <message> + <location filename="Project/Project.py" line="3177"/> <source><b>Profile Data...</b><p>This shows the profiling data for the project.</p></source> <translation><b>剖析数据……</b><p>显示项目的剖析数据。</p></translation> </message> @@ -30032,32 +30085,32 @@ <translation type="obsolete"><b>移除循环报告</b><p>移除项目的循环报告。</p></translation> </message> <message> - <location filename="Project/Project.py" line="3892"/> + <location filename="Project/Project.py" line="3897"/> <source>Application Diagram</source> <translation>应用程序图</translation> </message> <message> - <location filename="Project/Project.py" line="3179"/> - <source>&Application Diagram...</source> - <translation>应用程序(&A)图……</translation> - </message> - <message> - <location filename="Project/Project.py" line="3182"/> - <source>Show a diagram of the project.</source> - <translation>显示项目图表。</translation> - </message> - <message> <location filename="Project/Project.py" line="3184"/> + <source>&Application Diagram...</source> + <translation>应用程序(&A)图……</translation> + </message> + <message> + <location filename="Project/Project.py" line="3187"/> + <source>Show a diagram of the project.</source> + <translation>显示项目图表。</translation> + </message> + <message> + <location filename="Project/Project.py" line="3189"/> <source><b>Application Diagram...</b><p>This shows a diagram of the project.</p></source> <translation><b>应用程序图……</b><p>显示项目的图表。</p></translation> </message> <message> - <location filename="Project/Project.py" line="4023"/> + <location filename="Project/Project.py" line="4028"/> <source>Create Package List</source> <translation>创建程序包列表</translation> </message> <message> - <location filename="Project/Project.py" line="3193"/> + <location filename="Project/Project.py" line="3198"/> <source>Create &Package List</source> <translation>创建程序包(&P)列表</translation> </message> @@ -30072,12 +30125,12 @@ <translation type="obsolete"><b>创建程序包列表</b><p>创建一个初始化文件列表并包含到 Eric4 插件存档中。该列表从项目文件创建。</p></translation> </message> <message> - <location filename="Project/Project.py" line="4183"/> + <location filename="Project/Project.py" line="4188"/> <source>Create Plugin Archive</source> <translation>创建插件存档</translation> </message> <message> - <location filename="Project/Project.py" line="3207"/> + <location filename="Project/Project.py" line="3212"/> <source>Create Plugin &Archive</source> <translation>创建插件存档(&A)</translation> </message> @@ -30092,12 +30145,12 @@ <translation type="obsolete"><b>创建插件存档</b><p>通过 PKGLIST 文件给出的文件列表创建 Eric4 插件存档文件。存档名从主脚本名构建。</p></translation> </message> <message> - <location filename="Project/Project.py" line="3222"/> + <location filename="Project/Project.py" line="3227"/> <source>Create Plugin Archive (Snapshot)</source> <translation>创建插件存档(临时)</translation> </message> <message> - <location filename="Project/Project.py" line="3222"/> + <location filename="Project/Project.py" line="3227"/> <source>Create Plugin Archive (&Snapshot)</source> <translation>创建插件存档(临时(&S))</translation> </message> @@ -30112,77 +30165,77 @@ <translation type="obsolete">b>创建插件存档(临时)</b><p>通过 PKGLIST 文件给出的文件列表创建一个 Eric4 插件存档文件。存档名从主脚本名构建。修改主脚本的版本项以反映临时的版本。</p></translation> </message> <message> - <location filename="Project/Project.py" line="3256"/> + <location filename="Project/Project.py" line="3261"/> <source>&Project</source> <translation>项目(&P)</translation> </message> <message> - <location filename="Project/Project.py" line="3257"/> + <location filename="Project/Project.py" line="3262"/> <source>Open &Recent Projects</source> <translation>打开最近的项目</translation> </message> <message> - <location filename="Project/Project.py" line="3258"/> - <source>&Version Control</source> - <translation>版本(&V)控制</translation> - </message> - <message> - <location filename="Project/Project.py" line="3261"/> - <source>Chec&k</source> - <translation>检查(&k)</translation> - </message> - <message> <location filename="Project/Project.py" line="3263"/> - <source>Sho&w</source> - <translation>显示(&w)</translation> - </message> - <message> - <location filename="Project/Project.py" line="3264"/> - <source>&Diagrams</source> - <translation>图表(&D)</translation> - </message> - <message> - <location filename="Project/Project.py" line="3265"/> - <source>Session</source> - <translation>会话</translation> + <source>&Version Control</source> + <translation>版本(&V)控制</translation> </message> <message> <location filename="Project/Project.py" line="3266"/> - <source>Source &Documentation</source> - <translation>源文档(&D)</translation> + <source>Chec&k</source> + <translation>检查(&k)</translation> </message> <message> <location filename="Project/Project.py" line="3268"/> - <source>Debugger</source> - <translation>调试器</translation> + <source>Sho&w</source> + <translation>显示(&w)</translation> </message> <message> <location filename="Project/Project.py" line="3269"/> + <source>&Diagrams</source> + <translation>图表(&D)</translation> + </message> + <message> + <location filename="Project/Project.py" line="3270"/> + <source>Session</source> + <translation>会话</translation> + </message> + <message> + <location filename="Project/Project.py" line="3271"/> + <source>Source &Documentation</source> + <translation>源文档(&D)</translation> + </message> + <message> + <location filename="Project/Project.py" line="3273"/> + <source>Debugger</source> + <translation>调试器</translation> + </message> + <message> + <location filename="Project/Project.py" line="3274"/> <source>Pac&kagers</source> <translation>打包程序(&k)</translation> </message> <message> - <location filename="Project/Project.py" line="3371"/> + <location filename="Project/Project.py" line="3376"/> <source>Project</source> <translation>项目</translation> </message> <message> - <location filename="Project/Project.py" line="3432"/> + <location filename="Project/Project.py" line="3437"/> <source>&Clear</source> <translation>清除(&C)</translation> </message> <message> - <location filename="Project/Project.py" line="3542"/> + <location filename="Project/Project.py" line="3547"/> <source>Search New Files</source> <translation>搜索新文件</translation> </message> <message> - <location filename="Project/Project.py" line="3542"/> + <location filename="Project/Project.py" line="3547"/> <source>There were no new files found to be added.</source> <translation>没有要添加的新文件。</translation> </message> <message> - <location filename="Project/Project.py" line="3680"/> + <location filename="Project/Project.py" line="3685"/> <source>Version Control System</source> <translation>版本控制系统</translation> </message> @@ -30197,27 +30250,27 @@ <translation type="obsolete"><p>所选版本控制系统 <b>%1</b> 未找到。<br/>禁用版本控制。</p><p>%2</p></translation> </message> <message> - <location filename="Project/Project.py" line="3772"/> + <location filename="Project/Project.py" line="3777"/> <source>Coverage Data</source> <translation>覆盖率数据</translation> </message> <message> - <location filename="Project/Project.py" line="3818"/> + <location filename="Project/Project.py" line="3823"/> <source>There is no main script defined for the current project. Aborting</source> <translation>当前项目未定义主脚本。终止</translation> </message> <message> - <location filename="Project/Project.py" line="3793"/> + <location filename="Project/Project.py" line="3798"/> <source>Code Coverage</source> <translation>代码覆盖率</translation> </message> <message> - <location filename="Project/Project.py" line="3793"/> + <location filename="Project/Project.py" line="3798"/> <source>Please select a coverage file</source> <translation>请选择一个覆盖率文件</translation> </message> <message> - <location filename="Project/Project.py" line="3839"/> + <location filename="Project/Project.py" line="3844"/> <source>Please select a profile file</source> <translation>请选择一个剖析文件</translation> </message> @@ -30232,12 +30285,12 @@ <translation type="obsolete">请选择要移除的循环报告</translation> </message> <message> - <location filename="Project/Project.py" line="3892"/> + <location filename="Project/Project.py" line="3897"/> <source>Include module names?</source> <translation>包含模块名?</translation> </message> <message> - <location filename="Project/Project.py" line="3996"/> + <location filename="Project/Project.py" line="4001"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation><p>文件 <b>PKGLIST</b> 已存在。</p><p>是否覆盖?</p></translation> </message> @@ -30247,12 +30300,12 @@ <translation type="obsolete"><p>文件 <b>PKGLIST</b> 无法创建。</p><p>原因: %1</p></translation> </message> <message> - <location filename="Project/Project.py" line="4040"/> + <location filename="Project/Project.py" line="4045"/> <source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source> <translation><p>文件 <b>PKGLIST</b> 不存在。终止……</p></translation> </message> <message> - <location filename="Project/Project.py" line="4048"/> + <location filename="Project/Project.py" line="4053"/> <source>The project does not have a main script defined. Aborting...</source> <translation>项目未定义主脚本。终止……</translation> </message> @@ -30282,22 +30335,22 @@ <translation type="obsolete"><p>无法读取插件文件 <b>%1</b> 。</p><p>原因: %2</p></translation> </message> <message> - <location filename="Project/Project.py" line="3021"/> + <location filename="Project/Project.py" line="3026"/> <source>Lexer Associations</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3021"/> - <source>Lexer Associations...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Project/Project.py" line="3024"/> - <source>Show the project lexer associations (overriding defaults)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Project/Project.py" line="3026"/> + <source>Lexer Associations...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3029"/> + <source>Show the project lexer associations (overriding defaults)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Project/Project.py" line="3031"/> <source><b>Lexer Associations...</b><p>This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.</p></source> <translation type="unfinished"></translation> </message> @@ -30427,72 +30480,72 @@ <translation type="obsolete">项目文件 (*.e4p *.e4pz)</translation> </message> <message> - <location filename="Project/Project.py" line="3197"/> + <location filename="Project/Project.py" line="3202"/> <source>Create an initial PKGLIST file for an eric5 plugin.</source> <translation type="unfinished">为 Eric4 插件创建初始化 PKGLIST 文件。 {5 ?}</translation> </message> <message> - <location filename="Project/Project.py" line="3199"/> + <location filename="Project/Project.py" line="3204"/> <source><b>Create Package List</b><p>This creates an initial list of files to include in an eric5 plugin archive. The list is created from the project file.</p></source> <translation type="unfinished"><b>创建程序包列表</b><p>创建一个初始化文件列表并包含到 Eric4 插件存档中。该列表从项目文件创建。</p> {5 ?}</translation> </message> <message> - <location filename="Project/Project.py" line="3211"/> + <location filename="Project/Project.py" line="3216"/> <source>Create an eric5 plugin archive file.</source> <translation type="unfinished">创建一个 Eric4 插件存档文件。 {5 ?}</translation> </message> <message> - <location filename="Project/Project.py" line="3213"/> + <location filename="Project/Project.py" line="3218"/> <source><b>Create Plugin Archive</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name.</p></source> <translation type="unfinished"><b>创建插件存档</b><p>通过 PKGLIST 文件给出的文件列表创建 Eric4 插件存档文件。存档名从主脚本名构建。</p> {5 ?}</translation> </message> <message> - <location filename="Project/Project.py" line="3226"/> + <location filename="Project/Project.py" line="3231"/> <source>Create an eric5 plugin archive file (snapshot release).</source> <translation type="unfinished">创建一个 Eric4 插件存档文件(临时版) {5 ?}</translation> </message> <message> - <location filename="Project/Project.py" line="3228"/> + <location filename="Project/Project.py" line="3233"/> <source><b>Create Plugin Archive (Snapshot)</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name. The version entry of the main script is modified to reflect a snapshot release.</p></source> <translation type="unfinished">b>创建插件存档(临时)</b><p>通过 PKGLIST 文件给出的文件列表创建一个 Eric4 插件存档文件。存档名从主脚本名构建。修改主脚本的版本项以反映临时的版本。</p> {5 ?}</translation> </message> <message> - <location filename="Project/Project.py" line="3671"/> + <location filename="Project/Project.py" line="3676"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Reverting override.</p><p>{1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3680"/> + <location filename="Project/Project.py" line="3685"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Disabling version control.</p><p>{1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4023"/> + <location filename="Project/Project.py" line="4028"/> <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4060"/> + <location filename="Project/Project.py" line="4065"/> <source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4071"/> + <location filename="Project/Project.py" line="4076"/> <source><p>The eric5 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4091"/> + <location filename="Project/Project.py" line="4096"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4103"/> + <location filename="Project/Project.py" line="4108"/> <source><p>The eric5 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4183"/> + <location filename="Project/Project.py" line="4188"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -32336,22 +32389,22 @@ <context> <name>Purge</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="91"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="97"/> <source>Purge All Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="98"/> <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="95"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="101"/> <source>Purge Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="102"/> <source>Do really want to delete files not tracked by Mercurial?</source> <translation type="unfinished"></translation> </message> @@ -34569,177 +34622,177 @@ <context> <name>Queues</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="256"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="276"/> <source>New Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="325"/> <source>Update Current Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="356"/> - <source>Pop Patches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="360"/> - <source>Push Patches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="364"/> - <source>Go to Patch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> - <source>Select Patch</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="376"/> + <source>Pop Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="380"/> + <source>Push Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="384"/> + <source>Go to Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="515"/> + <source>Select Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="396"/> <source>Select the target patch name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="495"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="515"/> <source>No patches to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="447"/> <source>Finish Applied Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="459"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="479"/> <source>Rename Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="501"/> <source>Select the patch to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="490"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="510"/> <source>Delete Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="535"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="555"/> <source>Fold Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="551"/> <source>No patches selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="535"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="555"/> <source>No patches available to be folded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="559"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="579"/> <source>List Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="559"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="579"/> <source>No patches available to list guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="594"/> - <source>Define Guards</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> - <source>No patches available to define guards for.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="635"/> - <source>Drop All Guards</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="614"/> + <source>Define Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <source>No patches available to define guards for.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="659"/> + <source>Drop All Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="634"/> <source>Select the patch to drop guards for (leave empty for the current patch):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="693"/> <source>Set Active Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="693"/> <source>No guards available to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="691"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="715"/> <source>Deactivate Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="753"/> <source>Create New Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="755"/> <source>Rename Active Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="757"/> - <source>Error while creating a new queue.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/> - <source>Error while renaming the active queue.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="787"/> - <source>Purge Queue</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="789"/> + <source>Error while creating a new queue.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="792"/> + <source>Error while renaming the active queue.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="819"/> + <source>Purge Queue</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="821"/> <source>Delete Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="823"/> <source>Activate Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="820"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="860"/> <source>Error while purging the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="862"/> <source>Error while deleting the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="824"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="864"/> <source>Error while setting the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="847"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="887"/> <source>Available Queues</source> <translation type="unfinished"></translation> </message> @@ -53300,30 +53353,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1168"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1572"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1668"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1580"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1676"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1116"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1184"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1214"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -53334,23 +53387,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1566"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1662"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1680"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1683"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -53358,7 +53411,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1576"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1672"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>