Mercurial Repositories > eric / changeset
changeset
Updated translations.
Fri, 23 Aug 2019 13:23:36 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Fri, 23 Aug 2019 13:23:36 +0200
- changeset 7159
- 85a9d6a753bd
- parent 7158
- d38750ac8410
- child 7161
- 728018c32b09
Updated translations.
--- a/eric6/i18n/eric6_cs.ts Fri Aug 23 13:23:22 2019 +0200 +++ b/eric6/i18n/eric6_cs.ts Fri Aug 23 13:23:36 2019 +0200 @@ -6888,7 +6888,7 @@ <message> <location filename="../Debugger/DebugUI.py" line="597"/> <source>&Start</source> - <translation>&Start</translation> + <translation type="obsolete">&Start</translation> </message> <message> <location filename="../Debugger/DebugUI.py" line="599"/> @@ -7133,6 +7133,11 @@ <source>No locals available.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Debugger/DebugUI.py" line="597"/> + <source>Sta&rt</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DebugViewer</name> @@ -31227,7 +31232,7 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> <source>The hg process did not finish within 30s.</source> <translation>hg proces neskončil do 30s.</translation> </message> @@ -31257,420 +31262,420 @@ <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="630"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> <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="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="691"/> <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="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="760"/> <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="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1061"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1361"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936"/> <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="1983"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <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="2194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/> <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="2341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> <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="2366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2377"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2401"/> <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="2414"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2656"/> <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="2223"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2687"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2608"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <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="2737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/> <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="2533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2544"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2647"/> <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="2791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2802"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2782"/> <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="2550"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <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="2818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2829"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2822"/> <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="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="555"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3426"/> <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="3523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2897"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2938"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2949"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2996"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3052"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3101"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3292"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3280"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> <source>Revert changes</source> <translation type="unfinished">Vrátit změny</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="984"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="995"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3156"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Soubor <b>{0}</b> nelze přečíst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1787"/> <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/hg.py" line="943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="954"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3689"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3755"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3797"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3903"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3947"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1098"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/> - <source>Canceling uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3113"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3126"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <source>Aborting uncommitted merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -35403,432 +35408,432 @@ <translation><b>Sloučit</b><p>Sloučí se změny revize do lokálního projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>Tag in repository</source> <translation>Vytvořit tag v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>&Tag in repository...</source> <translation>Vytvořit &tag v repozitáři...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> - <source>Tag the local project in the repository</source> - <translation>Vytvořit Tag - značku z lokálního projektu do repozitáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Vytvořit tag v repozitáři</b><p>Z lokálního projektu vytvoří značku - tag v repozitáři.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> - <source>List tags</source> - <translation>Seznam tagů</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> - <source>List tags...</source> - <translation>Seznam tagů...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> - <source>List tags of the project</source> - <translation>Seznam tagů projektu</translation> + <source>Tag the local project in the repository</source> + <translation>Vytvořit Tag - značku z lokálního projektu do repozitáře</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>Seznam tagů</b><p>Zobrazí seznam tagů projektu.</p></translation> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Vytvořit tag v repozitáři</b><p>Z lokálního projektu vytvoří značku - tag v repozitáři.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>List branches</source> - <translation>Seznam větví</translation> + <source>List tags</source> + <translation>Seznam tagů</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>List branches...</source> - <translation>Seznam větví...</translation> + <source>List tags...</source> + <translation>Seznam tagů...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/> - <source>List branches of the project</source> - <translation>Seznam větví projektu</translation> + <source>List tags of the project</source> + <translation>Seznam tagů projektu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Seznam větví</b><p>Zobrazí seznam větví projektu.</p></translation> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Seznam tagů</b><p>Zobrazí seznam tagů projektu.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> - <source>Create branch</source> - <translation>Vytvořit větev</translation> + <source>List branches</source> + <translation>Seznam větví</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <source>List branches...</source> + <translation>Seznam větví...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> + <source>List branches of the project</source> + <translation>Seznam větví projektu</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Seznam větví</b><p>Zobrazí seznam větví projektu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> + <source>Create branch</source> + <translation>Vytvořit větev</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Create &branch...</source> <translation>Narou&bovat větev...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/> <source>Create a new branch for the local project in the repository</source> <translation>Vytvořit v repoziáři novou větev pro lokální projekt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Vytvořit větev</b><p>V repozitáři se vytvoří nová větev v lokálním projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> <source>Close branch</source> <translation>Zavřít větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> <source>Close the current branch of the local project</source> <translation>Zavře aktuální větev v lokálním projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Zavřít větev</b><p>Zavře aktuální větev v lokálním projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source>Switch</source> <translation>Přepnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source>S&witch...</source> <translation>&Přepnout...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source>Switch the working directory to another revision</source> <translation>Přepnout pracovní adresář do jiné revize</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Přepnout</b><p>Přepne pracovní adresář do jiné revize.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> - <source>Cleanup</source> - <translation>Vyčistit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> - <source>Cleanu&p</source> - <translation>Vy&prat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source>Cleanup the local project</source> - <translation>Vyčistit lokální projekt</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Vyčistit</b><p>Provede úklid lokálního projektu.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source>Execute command</source> - <translation>Provést příkaz</translation> + <source>Cleanup</source> + <translation>Vyčistit</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source>E&xecute command...</source> - <translation>P&rovést příkaz...</translation> + <source>Cleanu&p</source> + <translation>Vy&prat</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> - <source>Execute an arbitrary Mercurial command</source> - <translation>Spustit libovolný Mercurial příkaz</translation> + <source>Cleanup the local project</source> + <translation>Vyčistit lokální projekt</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Vyčistit</b><p>Provede úklid lokálního projektu.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source>Execute command</source> + <translation>Provést příkaz</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source>E&xecute command...</source> + <translation>P&rovést příkaz...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> + <source>Execute an arbitrary Mercurial command</source> + <translation>Spustit libovolný Mercurial příkaz</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Provést příkaz</b><p>Otevře se dialogové okno pro zadání libovolného Mercurial příkazu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source>Configure</source> <translation>Konfigurovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source>Configure...</source> <translation>Konfigurovat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Zobrazit konfigurační dialog s vybranou Mercurial stranou</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Konfigurovat</b><p>Zobrazit konfigurační dialog s vybranou Mercurial stranou.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> - <source>Show paths</source> - <translation>Zobrazit cesty</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> - <source>Show paths...</source> - <translation>Zobrazit cesty...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> - <source>Show the aliases for remote repositories</source> - <translation>Zobrazit aliasy pro vzádelené repozitáře</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation><b>Zobrazit cesty</b><p>Zobrazí aliasy vzdálených repozitářů.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> - <source>Verify repository</source> - <translation>Ověřit repozitář</translation> + <source>Show paths</source> + <translation>Zobrazit cesty</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> - <source>Verify repository...</source> - <translation>Ověřit repozitář...</translation> + <source>Show paths...</source> + <translation>Zobrazit cesty...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> - <source>Verify the integrity of the repository</source> - <translation>Ověřit integritu repozitáře</translation> + <source>Show the aliases for remote repositories</source> + <translation>Zobrazit aliasy pro vzádelené repozitáře</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> - <translation><b>Ověřit integritu repozitáře</b><p>Ověří integritu repozitáře.</p></translation> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation><b>Zobrazit cesty</b><p>Zobrazí aliasy vzdálených repozitářů.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Recover</source> - <translation>Zotavit</translation> + <source>Verify repository</source> + <translation>Ověřit repozitář</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Recover...</source> - <translation>Zotavit...</translation> + <source>Verify repository...</source> + <translation>Ověřit repozitář...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> - <source>Recover from an interrupted transaction</source> - <translation>Zotavit z přerušené transakce</translation> + <source>Verify the integrity of the repository</source> + <translation>Ověřit integritu repozitáře</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation><b>Ověřit integritu repozitáře</b><p>Ověří integritu repozitáře.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <source>Recover</source> + <translation>Zotavit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <source>Recover...</source> + <translation>Zotavit...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <source>Recover from an interrupted transaction</source> + <translation>Zotavit z přerušené transakce</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Zotavit</b><p>Obnoví integritu repozitáře narušenou přerušenou transakcí.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> - <source>Create .hgignore</source> - <translation>Vytvořit .hgignore</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> - <source>Create a .hgignore file with default values</source> - <translation>Vytvořit soubor .hgignore s výchozími hodnotami</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation><p>Vytvořit .hgignore<br>Vytvoří soubor .hgignore s výchozími hodnotami.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> - <source>Create changegroup</source> - <translation>Vytvořit skupinu změn</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <source>Create .hgignore</source> + <translation>Vytvořit .hgignore</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> + <source>Create a .hgignore file with default values</source> + <translation>Vytvořit soubor .hgignore s výchozími hodnotami</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation><p>Vytvořit .hgignore<br>Vytvoří soubor .hgignore s výchozími hodnotami.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/> + <source>Create changegroup</source> + <translation>Vytvořit skupinu změn</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/> <source>Create changegroup...</source> <translation>Vytvořit skupinu změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source>Create changegroup file collecting changesets</source> <translation>Vytvořit soubor s skupinou změn obsahující množinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1863"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824"/> <source>Apply changegroups...</source> <translation>Použít skupinu změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source>Apply one or several changegroup files</source> <translation>Použít soubory s jednou nebo více skupinami změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1362"/> <source>Changegroup Management</source> <translation>Správa skupin změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Vytvořit skupin změn</b><p>Vytvoří soubor se skupinou změn obsahující vybrané množiny změn (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Použít skupinu změn</b><p>Použije se soubor vygenerovaný příkazem 'Vytvořit skupinu změn', s jednou nebo více skupinami změn (hg unbundle)</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <source>Show current branch</source> <translation>Zobrazit aktuální větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source>Show the current branch of the project</source> <translation>Zobrazit aktuální větev projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Zobrazit aktuální větev</b><p>Zobrazí se aktuální větev projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Mark as "good"</source> - <translation>Označit jako "v pořádku"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="830"/> - <source>Mark a selectable changeset as good</source> - <translation>Označit volitelnou množinu změn, že je v pořádku</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation><b>Označit jako "v pořádku"</b><p>Označí se volitelná množina změn, že je v pořádku.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> - <source>Mark as "bad"</source> - <translation>Označit jako "špatná"</translation> + <source>Mark as "good"</source> + <translation>Označit jako "v pořádku"</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> - <source>Mark a selectable changeset as bad</source> - <translation>Označit volitelnou množinu změn jako špatnou</translation> + <source>Mark a selectable changeset as good</source> + <translation>Označit volitelnou množinu změn, že je v pořádku</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> - <translation><b>Označit jako "špatná"</b><p>Označí se volitelná množina změn, že je špatná.</p></translation> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation><b>Označit jako "v pořádku"</b><p>Označí se volitelná množina změn, že je v pořádku.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> - <source>Skip</source> - <translation>Přeskočit</translation> + <source>Mark as "bad"</source> + <translation>Označit jako "špatná"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> + <source>Mark a selectable changeset as bad</source> + <translation>Označit volitelnou množinu změn jako špatnou</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation><b>Označit jako "špatná"</b><p>Označí se volitelná množina změn, že je špatná.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <source>Skip</source> + <translation>Přeskočit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> <source>Reset</source> <translation>Reset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> <source>Reset the bisect search data</source> <translation>Reset vyhledávání bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Reset</b><p>Zresetuje bisect vyhledávání v datech.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1375"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Mark as "good"...</source> - <translation>Označit jako "v pořádku"...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> + <source>Mark as "good"...</source> + <translation>Označit jako "v pořádku"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> <source>Mark as "bad"...</source> <translation>Označit jako "špatná"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Preview changegroup...</source> <translation>Náhled skupiny změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source>Identify</source> <translation>Identifikovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source>Identify...</source> <translation>Identifikovat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source>Identify the project directory</source> <translation>Identifikovat adresář projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identifikovat</b><p>Identifikuje se adresář projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Náhled souboru skupiny změn obsahující množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Náhled skupiny změn</b><p>Zobrazí náhled souboru skupiny změn obsahující množiny změn.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source>Back out changeset</source> <translation>Vycouvat z množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Back out changes of an earlier changeset</source> <translation>Vrátit změny z předchozí množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Vycouvat z množiny změn</b><p>Vrátit změny z předchozí množiny změn.</p></translation> </message> @@ -35848,312 +35853,312 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> - <source>Serve project repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> - <source>Serve the project repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> - <source><b>Serve project repository</b><p>This serves the project repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> - <source>Specials</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656"/> - <source>Pull</source> - <translation type="unfinished">Stáhnout</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/> - <source>The project should be reread. Do this now?</source> - <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> - <source>Push new branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> - <source>Push the current branch of the local project as a new named branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> - <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> - <source>Rollback last transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> - <source>Rollback the last transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> - <source>Extensions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> - <source>Edit user configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> - <source>Edit user configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Show an editor to edit the user configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> - <source>Edit repository configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> - <source>Show an editor to edit the repository configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> - <source>Show the combined configuration settings from all configuration files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> - <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> - <source>Skip...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> - <source>Skip a selectable changeset</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> - <source><b>Skip</b><p>This skips a selectable changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1895"/> - <source>Import Patch</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> - <source>Import Patch...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> - <source>Import a patch from a patch file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> - <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <source>Serve project repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> + <source>Serve the project repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> + <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/> + <source>Specials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1674"/> + <source>Pull</source> + <translation type="unfinished">Stáhnout</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Push new branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/> + <source>Push the current branch of the local project as a new named branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> + <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> + <source>Rollback last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> + <source>Rollback the last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1420"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <source>Show an editor to edit the user configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <source>Show an editor to edit the repository configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Show the combined configuration settings from all configuration files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <source>Skip...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <source>Skip a selectable changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <source><b>Skip</b><p>This skips a selectable changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1919"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1939"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> - <source>Export revisions to patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="961"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source>Change Phase...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> - <source>Change the phase of revisions</source> + <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <source>Change Phase...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="989"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1959"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1020"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1974"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Add</source> <translation type="unfinished">Přidat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Add...</source> <translation type="unfinished">Přidat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Remove</source> <translation type="unfinished">Odebrat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1080"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1424"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -36183,32 +36188,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="917"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1328"/> <source>Administration</source> <translation type="unfinished"></translation> </message> @@ -36233,340 +36238,355 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> - <source>Cancel uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> - <source>Cancel an uncommitted merge and lose all changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> <source>List bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> <source>List bookmarks...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/> <source>List bookmarks of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1112"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/> <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1127"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/> <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Rename bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Rename bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source>Rename a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1157"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> <source>Move bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> <source>Move bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1172"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1180"/> <source>Show incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1174"/> - <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> - <source>Pull bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1188"/> + <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> + <source>Pull bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1205"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1229"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223"/> - <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1232"/> - <source>Push bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1237"/> + <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1246"/> + <source>Push bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1254"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399"/> + <source>Bookmarks</source> + <translation type="unfinished">Záložky</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1383"/> - <source>Bookmarks</source> - <translation type="unfinished">Záložky</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Tags</source> <translation type="unfinished">Tagy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> <source>Show conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> <source>Show conflicts...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="445"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="459"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1528"/> <source>Mercurial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1221"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1262"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1267"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> - <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> - <source>Delete all backups</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1279"/> + <source>Delete all backups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1284"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1287"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> - <source>Stop Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1018"/> - <source>Stop the interrupted copying session</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/> - <source>Abort Copying Session</source> + <source>Stop Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> + <source>Stop the interrupted copying session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <source>Abort Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> <source>Abort the interrupted copying session and rollback</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> + <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1445"/> + <source>Merge Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1988"/> + <source>Copy Changesets (Stop)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/> + <source>Copy Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> - <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1429"/> - <source>Merge Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1964"/> - <source>Copy Changesets (Stop)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/> - <source>Copy Changesets (Abort)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> + <source>Commit Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> + <source>Commit a merge.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <source>Abort Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> + <source>Abort an uncommitted merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443"/> + <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -47743,202 +47763,202 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="853"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="854"/> <source>Serial Device Connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="853"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="854"/> <source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="898"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="899"/> <source>Run Script</source> <translation type="unfinished">Spustit skript</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="881"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="882"/> <source>There is no editor open. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="889"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="890"/> <source>The current editor does not contain a script. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="898"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="899"/> <source><p>Cannot run script.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="922"/> <source>Open Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="922"/> <source>Python3 Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="965"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="966"/> <source>Start Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="965"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="966"/> <source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="995"/> <source>Unsaved Chart Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="995"/> <source>The chart contains unsaved data.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/> <source>Start File Manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/> <source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1097"/> <source>Show Version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1100"/> <source>Show Implementation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> <source>Synchronize Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1108"/> <source>Show Device Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1111"/> <source>Show Local Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1339"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1361"/> <source>Compile Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1359"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1381"/> <source>Compile Current Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1132"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1135"/> <source><h3>Device Version Information</h3></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1141"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1144"/> <source>No version information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1143"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1146"/> <source>Device Version Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1166"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1169"/> <source>unknown</source> <translation type="unfinished">neznámý</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/> <source>Device Implementation Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/> <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> <source><p>The time of the connected device was synchronized with the local time.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1216"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1219"/> <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1224"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1227"/> <source><h3>Device Date and Time</h3><p>{0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1238"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1241"/> <source>Device Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/> <source>Local Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/> <source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/> <source>Error handling device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/> <source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1291"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1313"/> <source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1309"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1331"/> <source>Python Files (*.py);;All Files (*)</source> <translation type="unfinished">Python soubory (*.py);;Všechny soubory (*)</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1319"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1341"/> <source>The Python file <b>{0}</b> does not exist. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1329"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1351"/> <source>'mpy-cross' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1352"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> <source>The current editor does not contain a Python file. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -47953,12 +47973,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="978"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="979"/> <source>µPy Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1059"/> <source>µPy Files</source> <translation type="unfinished"></translation> </message> @@ -78349,7 +78369,7 @@ <translation>Zjistit akt&ualizace...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3724"/> + <location filename="../UI/UserInterface.py" line="3731"/> <source>Report Bug</source> <translation>Reportovat Bugy</translation> </message> @@ -78369,7 +78389,7 @@ <translation><b>Reportovat bug...</b><p>Otevře se dialog pro reportování bugu.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3278"/> + <location filename="../UI/UserInterface.py" line="3285"/> <source>Unittest</source> <translation></translation> </message> @@ -78599,7 +78619,7 @@ <translation><b>Klávesové zkratky</b><p>Nastavení klávesových zkratek aplikace podle zvyklostí uživatele.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6313"/> + <location filename="../UI/UserInterface.py" line="6320"/> <source>Export Keyboard Shortcuts</source> <translation>Exportovat klávesové zkratky</translation> </message> @@ -78619,7 +78639,7 @@ <translation><b>Export klávesových zkratek</b><p>Exportují se klávesové zkratky z aplikace.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6337"/> + <location filename="../UI/UserInterface.py" line="6344"/> <source>Import Keyboard Shortcuts</source> <translation>Import klávesových zkratek</translation> </message> @@ -78724,62 +78744,62 @@ <translation>O&kno</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3189"/> + <location filename="../UI/UserInterface.py" line="3196"/> <source>&Toolbars</source> <translation>&Toolbary</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3202"/> + <location filename="../UI/UserInterface.py" line="3209"/> <source>&Help</source> <translation>&Nápověda</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3277"/> + <location filename="../UI/UserInterface.py" line="3284"/> <source>Tools</source> <translation>Nástroje</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3279"/> + <location filename="../UI/UserInterface.py" line="3286"/> <source>Settings</source> <translation>Nastavení</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5111"/> + <location filename="../UI/UserInterface.py" line="5118"/> <source>Help</source> <translation>Nápověda</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3281"/> + <location filename="../UI/UserInterface.py" line="3288"/> <source>Profiles</source> <translation>Profily</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3664"/> + <location filename="../UI/UserInterface.py" line="3671"/> <source><h3>Version Numbers</h3><table></source> <translation><h3>Čísla verzí</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7302"/> + <location filename="../UI/UserInterface.py" line="7309"/> <source></table></source> <translation></table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3724"/> + <location filename="../UI/UserInterface.py" line="3731"/> <source>Email address or mail server address is empty. Please configure your Email settings in the Preferences Dialog.</source> <translation>Emailová adresa nebo mail server adresa jsou prázdné. Prosím, nastavte váš email v dialogovém okně Nastavení.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4090"/> + <location filename="../UI/UserInterface.py" line="4097"/> <source>Configure Tool Groups ...</source> <translation>Konfigurace Skupin nástrojů...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4094"/> + <location filename="../UI/UserInterface.py" line="4101"/> <source>Configure current Tool Group ...</source> <translation>Konfigurace aktuální skupiny nástrojů...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4045"/> + <location filename="../UI/UserInterface.py" line="4052"/> <source>&Builtin Tools</source> <translation>&Vestavěné nástroje</translation> </message> @@ -78789,62 +78809,62 @@ <translation type="obsolete">V aktuálním projektu není definován hlavní skript. Zrušeno</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5237"/> + <location filename="../UI/UserInterface.py" line="5244"/> <source>Problem</source> <translation>Problém</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5426"/> + <location filename="../UI/UserInterface.py" line="5433"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5111"/> + <location filename="../UI/UserInterface.py" line="5118"/> <source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source> <translation>Aktuálně není vybrán žádný prohlížeč. Prosím otevřete Nastavení a nějaký vyberte.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5145"/> + <location filename="../UI/UserInterface.py" line="5152"/> <source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source> <translation><p>Nemohu spustit prohlížeč nápovědy.<br>Ověřte jestli je dostupný jako <b>hh</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5901"/> + <location filename="../UI/UserInterface.py" line="5908"/> <source>Documentation Missing</source> <translation>Dokumentace chybí</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5884"/> + <location filename="../UI/UserInterface.py" line="5891"/> <source>Documentation</source> <translation>Dokumentace</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5709"/> + <location filename="../UI/UserInterface.py" line="5716"/> <source><p>The PyQt4 documentation starting point has not been configured.</p></source> <translation type="unfinished"><p>Počátek dokumentace PySide nebyl nastaven.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6506"/> + <location filename="../UI/UserInterface.py" line="6513"/> <source>Save tasks</source> <translation>Uložit úlohy</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6535"/> + <location filename="../UI/UserInterface.py" line="6542"/> <source>Read tasks</source> <translation>Načíst úlohy</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6902"/> <source>Drop Error</source> <translation>Zahodit chybu</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7264"/> + <location filename="../UI/UserInterface.py" line="7271"/> <source>Error during updates check</source> <translation>Chyba během zjišťování aktualizací</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7245"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Update available</source> <translation>Byla nalezena aktualizace</translation> </message> @@ -78859,17 +78879,17 @@ <translation>Zobrazit externí nás&troje</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7264"/> + <location filename="../UI/UserInterface.py" line="7271"/> <source>Could not perform updates check.</source> <translation>Kontrolu updatů nelze provést.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7080"/> + <location filename="../UI/UserInterface.py" line="7087"/> <source>&Cancel</source> <translation>&Zrušit</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7339"/> + <location filename="../UI/UserInterface.py" line="7346"/> <source>First time usage</source> <translation>Spuštěno poprvé</translation> </message> @@ -78884,7 +78904,7 @@ <translation>P&luginy</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3282"/> + <location filename="../UI/UserInterface.py" line="3289"/> <source>Plugins</source> <translation>Pluginy</translation> </message> @@ -78909,7 +78929,7 @@ <translation>&Plugin Infa...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4062"/> + <location filename="../UI/UserInterface.py" line="4069"/> <source>&Plugin Tools</source> <translation>&Plugin nástroje</translation> </message> @@ -78929,12 +78949,12 @@ <translation><b>Odinstalovat plugin...</b><p>Otevře dialog pro odinstalaci pluginu.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4210"/> + <location filename="../UI/UserInterface.py" line="4217"/> <source>&Show all</source> <translation>&Zobrazit vše</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4212"/> + <location filename="../UI/UserInterface.py" line="4219"/> <source>&Hide all</source> <translation>&Skrýt vše</translation> </message> @@ -78964,7 +78984,7 @@ <translation>Zobrazit dostupné verze ke stažení</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7288"/> + <location filename="../UI/UserInterface.py" line="7295"/> <source><h3>Available versions</h3><table></source> <translation><h3>Dostupné verze</h3><table></translation> </message> @@ -79044,7 +79064,7 @@ <translation>Obnovit manažer nástrojových lišt...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5371"/> + <location filename="../UI/UserInterface.py" line="5378"/> <source>External Tools</source> <translation>Externí nástroje</translation> </message> @@ -79059,22 +79079,22 @@ <translation>Prohlížeč &multiprojektu</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6631"/> + <location filename="../UI/UserInterface.py" line="6638"/> <source>Save session</source> <translation>Uložit relaci</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6615"/> + <location filename="../UI/UserInterface.py" line="6622"/> <source>Read session</source> <translation>Načíst relaci</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3454"/> + <location filename="../UI/UserInterface.py" line="3461"/> <source><p>This part of the status bar displays the current editors encoding.</p></source> <translation><p>Tato část status baru zobrazuje aktuální kódování editorů.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3468"/> + <location filename="../UI/UserInterface.py" line="3475"/> <source><p>This part of the status bar displays an indication of the current editors files writability.</p></source> <translation><p>Tato část status baru zobrazuje indikátor práva zápisu editoru do souboru.</p></translation> </message> @@ -79099,17 +79119,17 @@ <translation><b>Požadavek na vlastnost...</b><p>Otevře dialog pro odeslání požadavku.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3447"/> + <location filename="../UI/UserInterface.py" line="3454"/> <source><p>This part of the status bar displays the current editors language.</p></source> <translation><p>Tato část status baru zobrazuje aktuální jazyk editoru.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3475"/> - <source><p>This part of the status bar displays the line number of the current editor.</p></source> - <translation><p>Tato část status baru zobrazuje číslo řádku v aktuálním editoru.</p></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="3482"/> + <source><p>This part of the status bar displays the line number of the current editor.</p></source> + <translation><p>Tato část status baru zobrazuje číslo řádku v aktuálním editoru.</p></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="3489"/> <source><p>This part of the status bar displays the cursor position of the current editor.</p></source> <translation><p>Tato část status baru zobrazuje pozici kurzoru v aktuálním editoru.</p></translation> </message> @@ -79134,12 +79154,12 @@ <translation><b>Přepnout vodorovnou nástrojovou lištu</b><p>Pokud je vodorovná nástrojová lišta skryta, tak se zobrazí. Je-li zobrazena, skryje se.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4009"/> + <location filename="../UI/UserInterface.py" line="4016"/> <source>Restart application</source> <translation>Restartovat aplikaci</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4009"/> + <location filename="../UI/UserInterface.py" line="4016"/> <source>The application needs to be restarted. Do it now?</source> <translation>Aplikace potřebuje restartovat. Má se provést nyní?</translation> </message> @@ -79154,7 +79174,7 @@ <translation>Konfigurovat...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3461"/> + <location filename="../UI/UserInterface.py" line="3468"/> <source><p>This part of the status bar displays the current editors eol setting.</p></source> <translation><p>Tato část status baru zobrazuje eol nastavení v aktuálním editoru.</p></translation> </message> @@ -79294,7 +79314,7 @@ <translation>Editor &ikon...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5058"/> + <location filename="../UI/UserInterface.py" line="5065"/> <source>Qt 3 support</source> <translation>Qt 3 podpora</translation> </message> @@ -79329,111 +79349,111 @@ <translation>{0} - {1} - {2} - pasivní mód</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3558"/> + <location filename="../UI/UserInterface.py" line="3565"/> <source>External Tools/{0}</source> <translation>Externí nástroje/{0}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5237"/> + <location filename="../UI/UserInterface.py" line="5244"/> <source><p>The file <b>{0}</b> does not exist or is zero length.</p></source> <translation><p>Soubor <b>{0}</b> neexistuje nebo má nulovou délku.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4961"/> + <location filename="../UI/UserInterface.py" line="4968"/> <source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Nemohu spustit Qt-Designer.<br>Ověřte jestli je dostupný jako <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5030"/> + <location filename="../UI/UserInterface.py" line="5037"/> <source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Nemohu spustit Qt-Linguist.<br>Ověřte jestli je dostupný jako <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5083"/> + <location filename="../UI/UserInterface.py" line="5090"/> <source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Nemohu spustit Qt-Assistant.<br>Ověřte jestli je dostupný jako <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5125"/> + <location filename="../UI/UserInterface.py" line="5132"/> <source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Nemohu spustit aktuální prohlížeč.<br>Ověřte jestli je dostupný jako <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5193"/> + <location filename="../UI/UserInterface.py" line="5200"/> <source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Nemohu spustit UI Previewer.<br>Ověřte jestli je dostupný jako <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5248"/> + <location filename="../UI/UserInterface.py" line="5255"/> <source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Nemohu spustit Previewer překladů.<br>Ověřte jestli je dostupný jako <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5269"/> + <location filename="../UI/UserInterface.py" line="5276"/> <source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Nelze spustit SQL Browser.<br>Ujistěte se, že je dostupný jako <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5362"/> + <location filename="../UI/UserInterface.py" line="5369"/> <source>No tool entry found for external tool '{0}' in tool group '{1}'.</source> <translation>V externím nástroji '{0}' ve skupině '{1}' nebyl záznam nástroje nalezen.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5371"/> + <location filename="../UI/UserInterface.py" line="5378"/> <source>No toolgroup entry '{0}' found.</source> <translation>Skupina nástrojů '{0}' nenalezena. </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5410"/> + <location filename="../UI/UserInterface.py" line="5417"/> <source>Starting process '{0} {1}'. </source> <translation>Spouštím proces '{0} {1}'. </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5426"/> + <location filename="../UI/UserInterface.py" line="5433"/> <source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source> <translation><p>Nemohu spustit příkaz <b>{0}</b><br>Ověřte jestli je dostupný jako <b>{1}</b>. </p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5502"/> + <location filename="../UI/UserInterface.py" line="5509"/> <source>Process '{0}' has exited. </source> <translation>Proces '{0}' byl ukončen. </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5901"/> + <location filename="../UI/UserInterface.py" line="5908"/> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation><p>Adresář dokumentace "<b>{0}</b>" nebyl nalezen.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6506"/> + <location filename="../UI/UserInterface.py" line="6513"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation><p>Do souboru s úlohami <b>{0}</b> nelze zapisovat.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6535"/> + <location filename="../UI/UserInterface.py" line="6542"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation><p>Soubor s úlohami <b>{0}</b> nelze načíst.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6569"/> + <location filename="../UI/UserInterface.py" line="6576"/> <source><p>The session file <b>{0}</b> could not be written.</p></source> <translation><p>Zápis do souboru relace session <b>{0}</b> se nezdařil.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6615"/> + <location filename="../UI/UserInterface.py" line="6622"/> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation><p>Soubor relace session <b>{0}</b> nelze přečíst.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6902"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> není soubor.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7089"/> + <location filename="../UI/UserInterface.py" line="7096"/> <source>Trying host {0}</source> <translation>Zkouším host {0}</translation> </message> @@ -79468,7 +79488,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6337"/> + <location filename="../UI/UserInterface.py" line="6344"/> <source>Keyboard shortcut file (*.e4k)</source> <translation type="unfinished"></translation> </message> @@ -79508,27 +79528,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7153"/> + <location filename="../UI/UserInterface.py" line="7160"/> <source>Error getting versions information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7146"/> - <source>The versions information could not be downloaded. Please go online and try again.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="6103"/> - <source>Open Browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="6103"/> - <source>Could not start a web browser</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7153"/> + <source>The versions information could not be downloaded. Please go online and try again.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="6110"/> + <source>Open Browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="6110"/> + <source>Could not start a web browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7160"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -79614,12 +79634,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5339"/> + <location filename="../UI/UserInterface.py" line="5346"/> <source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7358"/> + <location filename="../UI/UserInterface.py" line="7365"/> <source>Select Workspace Directory</source> <translation type="unfinished"></translation> </message> @@ -79984,7 +80004,7 @@ <translation type="unfinished">Otevřít PyQt4 dokumentaci {5 ?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5771"/> + <location filename="../UI/UserInterface.py" line="5778"/> <source><p>The PyQt5 documentation starting point has not been configured.</p></source> <translation type="unfinished"><p>Adresář PyQt4 dokumentace není nakonfigurován.</p> {5 ?}</translation> </message> @@ -79994,7 +80014,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7080"/> + <location filename="../UI/UserInterface.py" line="7087"/> <source>%v/%m</source> <translation type="unfinished"></translation> </message> @@ -80014,7 +80034,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7084"/> + <location filename="../UI/UserInterface.py" line="7091"/> <source>Version Check</source> <translation type="unfinished"></translation> </message> @@ -80084,27 +80104,27 @@ <translation type="unfinished"><b>Eric API dokumentace</b><p>Zobrazit Eric API dokumentaci. Umístění dokumentace je v podadresáři Documentation/Source v instalačním adresáři eric5.</p> {6 ?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5058"/> + <location filename="../UI/UserInterface.py" line="5065"/> <source>Qt v.3 is not supported by eric6.</source> <translation type="unfinished">Qt v.3 není podporováno v eric5. {3 ?} {6.?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7245"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation type="unfinished">Aktualizace <b>{0}</b> eric5 je připravena na <b>{1}</b>. Chcete ji stáhnout a nainstalovat? {0}?} {6 ?} {1}?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7257"/> + <location filename="../UI/UserInterface.py" line="7264"/> <source>Eric6 is up to date</source> <translation type="unfinished">Eric5 je aktuální {6 ?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7257"/> + <location filename="../UI/UserInterface.py" line="7264"/> <source>You are using the latest version of eric6</source> <translation type="unfinished">Používáte poslední verzi eric6</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7339"/> + <location filename="../UI/UserInterface.py" line="7346"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished">eric5 nebyl ještě nakonfigurován. Bude spuštěn konfigurační dialog. {6 ?}</translation> </message> @@ -80114,17 +80134,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4065"/> + <location filename="../UI/UserInterface.py" line="4072"/> <source>&User Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4137"/> + <location filename="../UI/UserInterface.py" line="4144"/> <source>No User Tools Configured</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7100"/> + <location filename="../UI/UserInterface.py" line="7107"/> <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -80169,7 +80189,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6653"/> + <location filename="../UI/UserInterface.py" line="6660"/> <source>Load session</source> <translation type="unfinished">Načíst relaci</translation> </message> @@ -80184,17 +80204,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6653"/> + <location filename="../UI/UserInterface.py" line="6660"/> <source>eric6 Session Files (*.e5s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6700"/> + <location filename="../UI/UserInterface.py" line="6707"/> <source>Crash Session found!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6700"/> + <location filename="../UI/UserInterface.py" line="6707"/> <source>A session file of a crashed session was found. Shall this session be restored?</source> <translation type="unfinished"></translation> </message> @@ -80209,17 +80229,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7233"/> + <location filename="../UI/UserInterface.py" line="7240"/> <source>Update Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7233"/> + <location filename="../UI/UserInterface.py" line="7240"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7223"/> + <location filename="../UI/UserInterface.py" line="7230"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation type="unfinished"></translation> </message> @@ -80274,7 +80294,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5884"/> + <location filename="../UI/UserInterface.py" line="5891"/> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> @@ -80309,22 +80329,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3128"/> + <location filename="../UI/UserInterface.py" line="3135"/> <source>Left Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3144"/> + <location filename="../UI/UserInterface.py" line="3151"/> <source>Bottom Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3155"/> + <location filename="../UI/UserInterface.py" line="3162"/> <source>Right Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3179"/> + <location filename="../UI/UserInterface.py" line="3186"/> <source>Plug-ins</source> <translation type="unfinished"></translation> </message> @@ -80350,17 +80370,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6058"/> + <location filename="../UI/UserInterface.py" line="6065"/> <source>Start Web Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6000"/> + <location filename="../UI/UserInterface.py" line="6007"/> <source>The eric6 web browser could not be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6058"/> + <location filename="../UI/UserInterface.py" line="6065"/> <source><p>The eric6 web browser is not started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -80375,7 +80395,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3493"/> + <location filename="../UI/UserInterface.py" line="3500"/> <source><p>This part of the status bar allows zooming the current editor or shell.</p></source> <translation type="unfinished"></translation> </message> @@ -80449,6 +80469,11 @@ <source><b>MicroPython</b><p>This switches the input focus to the MicroPython window.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../UI/UserInterface.py" line="3128"/> + <source>Central Park</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name> @@ -90409,46 +90434,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1427"/> <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="2056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <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="2066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <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="1436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1447"/> <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="2048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/> <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="2051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <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="2075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <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> @@ -90456,12 +90481,12 @@ <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="2061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1481"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -90472,13 +90497,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/eric6/i18n/eric6_de.ts Fri Aug 23 13:23:22 2019 +0200 +++ b/eric6/i18n/eric6_de.ts Fri Aug 23 13:23:36 2019 +0200 @@ -6945,11 +6945,6 @@ <translation>Debu&g</translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="597"/> - <source>&Start</source> - <translation>&Start</translation> - </message> - <message> <location filename="../Debugger/DebugUI.py" line="642"/> <source>Start</source> <translation>Start</translation> @@ -7138,6 +7133,11 @@ <source>No locals available.</source> <translation>Keine lokalen Variablen verfügbar.</translation> </message> + <message> + <location filename="../Debugger/DebugUI.py" line="597"/> + <source>Sta&rt</source> + <translation>Sta&rt</translation> + </message> </context> <context> <name>DebugViewer</name> @@ -31245,7 +31245,7 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> <source>The hg process did not finish within 30s.</source> <translation>Der hg-Prozess endete nicht innerhalb von 30s.</translation> </message> @@ -31275,420 +31275,420 @@ <translation>Klone das Projekt aus dem Mercurial-Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="630"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> <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="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="691"/> <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="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="760"/> <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="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1061"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1361"/> <source>Mercurial command</source> <translation>Mercurial-Befehl</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936"/> <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="1983"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <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="2194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/> <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="2341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> <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="2366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2377"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2401"/> <source>Showing aliases for remote repositories</source> <translation>Zeige Namen für entfernte Repositorys</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2414"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2656"/> <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="2223"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2687"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial-Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2608"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <source>Create .hgignore file</source> <translation>.hgignore-Datei erstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <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="2737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/> <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="2533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2544"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2647"/> <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="2791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2802"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2782"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2550"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <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="2818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2829"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2822"/> <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="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="555"/> <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="3523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/> <source>Mercurial Command Server</source> <translation>Mercurial-Befehlsserver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3426"/> <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="3523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial-Befehlsserver konnte nicht gestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2897"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2938"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2949"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2996"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3052"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3101"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/> <source>Add Sub-repository</source> <translation>Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3292"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gelesen werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub enthält bereits einen Eintrag <b>{0}</b>. Abbruch...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>Die Unterrepositorydatei .hgsub konnte nicht gespeichert werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> <source>Remove Sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3280"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> <source>Commit Changes</source> <translation>Änderungen einpflegen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation>Das Einpflegen von Änderungen betrifft Dateien mit ungesicherten Änderungen. Soll die Aktion fortgesetzt werden?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="984"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="995"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation>Wollen Sie wirklich alle Änderungen an den folgenden Datein oder Verzeichnissen rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> <source>Do you really want to revert all changes of the project?</source> <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3156"/> <source>Create Unversioned Archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> <source>Mercurial Side-by-Side Difference</source> <translation>Mercurial Unterschiede nebeneinander anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht gelesen werden.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1787"/> <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/hg.py" line="943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="954"/> <source>Tagging in the Mercurial repository</source> <translation>Marke im Mercurial-Repository setzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Created new branch <{0}>.</source> <translation>Neuer Zweig <{0}> wurde angelegt.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> <source>Current branch tip</source> <translation>Spitze des aktuellen Zweigs</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3689"/> <source>Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/> <source>Delete Bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/> <source>Select the bookmark to be deleted:</source> <translation>Wähle das zu löschende Lesezeichen aus:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> <source>Delete Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3755"/> <source>Rename Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3797"/> <source>Move Mercurial Bookmark</source> <translation>Mercurial-Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/> <source>Pull Bookmark</source> <translation>Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/> <source>Select the bookmark to be pulled:</source> <translation>Wähle das herunterzuladende Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3903"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Lade Lesezeichen von einem entfernten Mercurial-Repository herunter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/> <source>Push Bookmark</source> <translation>Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/> <source>Select the bookmark to be push:</source> <translation>Wähle das hochzuladende Lesezeichen:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3947"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Lade Lesezeichen zu einem entfernten Mercurial-Repository hoch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/> <source>Re-Merge</source> <translation>Neu zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1098"/> <source>Do you really want to re-merge these files or directories?</source> <translation>Wollen Sie wirklich diese Dateien oder Verzeichnisse neu zusammenführen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/> <source>Do you really want to re-merge the project?</source> <translation>Wollen Sie wirklich das Projekt neu zusammenführen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/> <source>Re-Merging</source> <translation>Neu zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <source>Marking as 'unresolved'</source> <translation>Markiere als 'nicht aufgelöst'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> <source>Marking as 'resolved'</source> <translation>Markiere als 'aufgelöst'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/> <source>Delete All Backups</source> <translation>Alle Backups löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation><p>Sollen wirklich alle Backupdateien des Backupbereiches <b>{0}</b> gelöscht werden?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/> - <source>Canceling uncommitted merge</source> - <translation>Breche Zusammenführung ab</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3113"/> <source>Copy Changesets (Stop)</source> <translation>Änderungssätze kopieren (Stopp)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3126"/> <source>Copy Changesets (Abort)</source> <translation>Änderungssätze kopieren (Abbruch)</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <source>Aborting uncommitted merge</source> + <translation>Breche Zusammenführung ab</translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -35451,432 +35451,432 @@ <translation><b>Änderungen zusammenführen</b><p>Dies führt Änderungen einer Revision mit dem lokalen Projekt zusammen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>Tag in repository</source> <translation>Im Repository markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>&Tag in repository...</source> <translation>Im Repository &markieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> - <source>Tag the local project in the repository</source> - <translation>Das lokale Projekt im Repository markieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Im Repository markieren</b><p>Dies markiert das lokale Projekt im Repository.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> - <source>List tags</source> - <translation>Marken listen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> - <source>List tags...</source> - <translation>Marken listen...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> - <source>List tags of the project</source> - <translation>Listet Marken des Projektes</translation> + <source>Tag the local project in the repository</source> + <translation>Das lokale Projekt im Repository markieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>Marken listen</b><p>Dies listet die Marken des Projektes.</p></translation> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Im Repository markieren</b><p>Dies markiert das lokale Projekt im Repository.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>List branches</source> - <translation>Zweige listen</translation> + <source>List tags</source> + <translation>Marken listen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>List branches...</source> - <translation>Zweige listen...</translation> + <source>List tags...</source> + <translation>Marken listen...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/> - <source>List branches of the project</source> - <translation>Listet Zweige des Projektes</translation> + <source>List tags of the project</source> + <translation>Listet Marken des Projektes</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Zweige listen</b><p>Dies listet die Zweige des Projektes.</p></translation> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Marken listen</b><p>Dies listet die Marken des Projektes.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> - <source>Create branch</source> - <translation>Zweig erzeugen</translation> + <source>List branches</source> + <translation>Zweige listen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <source>List branches...</source> + <translation>Zweige listen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> + <source>List branches of the project</source> + <translation>Listet Zweige des Projektes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Zweige listen</b><p>Dies listet die Zweige des Projektes.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> + <source>Create branch</source> + <translation>Zweig erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Create &branch...</source> <translation>&Zweig erzeugen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/> <source>Create a new branch for the local project in the repository</source> <translation>Erzeuge einen neuen Zweig für das lokale Projekt im Repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Zweig erzeugen</b><p>Dies erzeugt einen neuen Zweig für das lokale Projekt im Repository</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> <source>Close branch</source> <translation>Zweig abschließen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> <source>Close the current branch of the local project</source> <translation>Schließt den aktuellen Zweig des lokalen Projektes ab</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Zweig abschließen</b><p>Dies schließt den aktuellen Zweig des lokalen Projektes ab.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source>Switch</source> <translation>Umschalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source>S&witch...</source> <translation>Umschal&ten...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source>Switch the working directory to another revision</source> <translation>Schaltet das Arbeitsverzeichnis auf eine andere Revision um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Umschalten</b><p>Dies schaltet das lokale Arbeitsverzeichnis auf eine andere Revision um.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> - <source>Cleanup</source> - <translation>Aufräumen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> - <source>Cleanu&p</source> - <translation>Au&fräumen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source>Cleanup the local project</source> - <translation>Räume das lokale Projekt auf</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Aufräumen</b><p>Dies räumt das lokale Projekt auf.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source>Execute command</source> - <translation>Befehl ausführen</translation> + <source>Cleanup</source> + <translation>Aufräumen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source>E&xecute command...</source> - <translation>Befehl ausf&ühren...</translation> + <source>Cleanu&p</source> + <translation>Au&fräumen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> - <source>Execute an arbitrary Mercurial command</source> - <translation>Führe einen beliebigen Mercurial-Befehl aus</translation> + <source>Cleanup the local project</source> + <translation>Räume das lokale Projekt auf</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Aufräumen</b><p>Dies räumt das lokale Projekt auf.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source>Execute command</source> + <translation>Befehl ausführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source>E&xecute command...</source> + <translation>Befehl ausf&ühren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> + <source>Execute an arbitrary Mercurial command</source> + <translation>Führe einen beliebigen Mercurial-Befehl aus</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Befehl ausführen</b><p>Dies öffnet einen Dialog zur Eingabe eines beliebeigen Mercurial-Befehls.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source>Configure</source> <translation>Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source>Configure...</source> <translation>Einstellungen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Zeigt den Konfigurationsdialog mit ausgewählter Mercurial-Seite</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Einstellungen</b><p>Zeigt den Konfigurationsdialog mit ausgewählter Mercurial-Seite.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> - <source>Show paths</source> - <translation>Pfade anzeigen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> - <source>Show paths...</source> - <translation>Pfade anzeigen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> - <source>Show the aliases for remote repositories</source> - <translation>Zeigt die Namen für entfernte Repositorys</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation><b>Pfade anzeigen</b><p>Dies zeigt die Namen für entfernte Repositorys.</p<</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> - <source>Verify repository</source> - <translation>Repository verifizieren</translation> + <source>Show paths</source> + <translation>Pfade anzeigen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> - <source>Verify repository...</source> - <translation>Repository verifizieren...</translation> + <source>Show paths...</source> + <translation>Pfade anzeigen...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> - <source>Verify the integrity of the repository</source> - <translation>Verfiziert die Integrität des Repository</translation> + <source>Show the aliases for remote repositories</source> + <translation>Zeigt die Namen für entfernte Repositorys</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> - <translation><b>Repository verifizieren</b><p>Dies verfiziert die Integrität des Repository.</p></translation> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation><b>Pfade anzeigen</b><p>Dies zeigt die Namen für entfernte Repositorys.</p<</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Recover</source> - <translation>Transaktion zurücksetzen</translation> + <source>Verify repository</source> + <translation>Repository verifizieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Recover...</source> - <translation>Transaktion zurücksetzen...</translation> + <source>Verify repository...</source> + <translation>Repository verifizieren...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> - <source>Recover from an interrupted transaction</source> - <translation>Setzt eine abgebrochene Transaktion zurück</translation> + <source>Verify the integrity of the repository</source> + <translation>Verfiziert die Integrität des Repository</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation><b>Repository verifizieren</b><p>Dies verfiziert die Integrität des Repository.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <source>Recover</source> + <translation>Transaktion zurücksetzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <source>Recover...</source> + <translation>Transaktion zurücksetzen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <source>Recover from an interrupted transaction</source> + <translation>Setzt eine abgebrochene Transaktion zurück</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Transaktion zurücksetzen</b><p>Dies setzt eine abgebrochene Transaktion zurück.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> - <source>Create .hgignore</source> - <translation>Erstelle .hgignore</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> - <source>Create a .hgignore file with default values</source> - <translation>Erstelle eine .hgignore-Datei mit Standardwerten</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation><b>Erstelle .hgignore</b><p>Dies erstellt eine .hgignore-Datei mit Standardwerten.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> - <source>Create changegroup</source> - <translation>Änderungsgruppe erzeugen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <source>Create .hgignore</source> + <translation>Erstelle .hgignore</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> + <source>Create a .hgignore file with default values</source> + <translation>Erstelle eine .hgignore-Datei mit Standardwerten</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation><b>Erstelle .hgignore</b><p>Dies erstellt eine .hgignore-Datei mit Standardwerten.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/> + <source>Create changegroup</source> + <translation>Änderungsgruppe erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/> <source>Create changegroup...</source> <translation>Änderungsgruppe erzeugen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source>Create changegroup file collecting changesets</source> <translation>Erzeuge eine Änderungsgruppendatei für Änderungssätze</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1863"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824"/> <source>Apply changegroups...</source> <translation>Änderungsgruppen anwenden...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source>Apply one or several changegroup files</source> <translation>Wende eine oder mehrere Änderungsgruppendateien an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1362"/> <source>Changegroup Management</source> <translation>Verwaltung von Änderungsgruppen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Änderungsgruppe erzeugen</b><p>Dies erzeuge eine Änderungsgruppendatei für ausgewählte Änderungssätze (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Änderungsgruppen anwenden</b><p>Dies wendet eine oder mehrere mit „Änderungsgruppe erzeugen“ erstellte Änderungsgruppendateien an (hg unbundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <source>Show current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source>Show the current branch of the project</source> <translation>Zeigt den aktuellen Zweig des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Zeige aktuellen Zweig</b><p>Dies zeigt den aktuellen Zweig des Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Mark as "good"</source> - <translation>Als „gut“ markieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="830"/> - <source>Mark a selectable changeset as good</source> - <translation>Markiere einen auswählbaren Änderungssatz als gut</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation><b>Als gut markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als gut.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> - <source>Mark as "bad"</source> - <translation>Als „schlecht“ markieren</translation> + <source>Mark as "good"</source> + <translation>Als „gut“ markieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> - <source>Mark a selectable changeset as bad</source> - <translation>Markiere einen auswählbaren Änderungssatz als schlecht</translation> + <source>Mark a selectable changeset as good</source> + <translation>Markiere einen auswählbaren Änderungssatz als gut</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> - <translation><b>Als schlecht markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als schlecht.</p></translation> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation><b>Als gut markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als gut.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> - <source>Skip</source> - <translation>Überspringen</translation> + <source>Mark as "bad"</source> + <translation>Als „schlecht“ markieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> + <source>Mark a selectable changeset as bad</source> + <translation>Markiere einen auswählbaren Änderungssatz als schlecht</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation><b>Als schlecht markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als schlecht.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <source>Skip</source> + <translation>Überspringen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> <source>Reset</source> <translation>Zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> <source>Reset the bisect search data</source> <translation>Setzt die Bisect Suchdaten zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Zurücksetzen</b><p>Dies setzt die Bisect Suchdaten zurück.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1375"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Mark as "good"...</source> - <translation>Als „gut“ markieren...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> + <source>Mark as "good"...</source> + <translation>Als „gut“ markieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> <source>Mark as "bad"...</source> <translation>Als „schlecht“ markieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Preview changegroup...</source> <translation>Änderungsgruppe ansehen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source>Identify</source> <translation>Identifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source>Identify...</source> <translation>Identifizieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source>Identify the project directory</source> <translation>Identifiziere das Projektverzeichnis</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identifizieren</b><p>Dies identifiziert das Projektverzeichnis.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Eine Änderungsgruppendatei für Änderungssätze ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Änderungsgruppe ansehen</b><p>Dies zeigt den Inhalt einer Änderungsgruppendatei für Änderungssätze an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source>Back out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Back out changes of an earlier changeset</source> <translation>Änderungen eines früheren Änderungssatzes umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Änderungssatz umkehren</b><p>Dies kehrt die Änderungen eines früheren Änderungssatzes um.</p></translation> </message> @@ -35896,312 +35896,312 @@ <translation><b>Änderungen hochladen (force)</b><p>Dies lädt Änderungen vom lokalen Repository an ein entferntes Repository mit der Option „force“ hoch.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/> <source>Specials</source> <translation>Spezialfunktionen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source>Serve project repository</source> <translation>Server für Projektrepository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> - <source>Serve project repository...</source> - <translation>Server für Projektrepository...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> - <source>Serve the project repository</source> - <translation>Server für das Projektrepository bereitstellen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> - <source><b>Serve project repository</b><p>This serves the project repository.</p></source> - <translation><b>Server für Projektrepository<b><p>Dies stellt einen Server für das Projektrepository zur Verfügung.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656"/> - <source>Pull</source> - <translation>Pull</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/> - <source>The project should be reread. Do this now?</source> - <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> - <source>Push new branch</source> - <translation>Neuen Zweig hochladen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> - <source>Push the current branch of the local project as a new named branch</source> - <translation>Lade den aktuellen Zweig als neuen benannten Zweig hoch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> - <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> - <translation><b>Neuen Zweig hochladen</b><p>Dies lädt den aktuellen Zweig als neuen benannten Zweig hoch.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> - <source>Rollback last transaction</source> - <translation>Letzte Transaktion zurücksetzen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> - <source>Rollback the last transaction</source> - <translation>Die letzte Transaktion zurücksetzen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> - <source>Extensions</source> - <translation>Erweiterungen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> - <source>Edit user configuration</source> - <translation>Nutzerkonfiguration editieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> - <source>Edit user configuration...</source> - <translation>Nutzerkonfiguration editieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Show an editor to edit the user configuration file</source> - <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation><b>Nutzerkonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> - <source>Edit repository configuration</source> - <translation>Repositorykonfiguration editieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> - <source>Edit repository configuration...</source> - <translation>Repositorykonfiguration editieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> - <source>Show an editor to edit the repository configuration file</source> - <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation><b>Repositorykonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> - <source>Show combined configuration settings</source> - <translation>Zeige kombinierte Einstellungen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> - <source>Show combined configuration settings...</source> - <translation>Zeige kombinierte Einstellungen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> - <source>Show the combined configuration settings from all configuration files</source> - <translation>Zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> - <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> - <translation><b>Zeige kombinierte Einstellungen</b><p>Dies zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> - <source>Skip...</source> - <translation>Überspringen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> - <source>Skip a selectable changeset</source> - <translation>Überspringe einen auswählbaren Änderungssatz</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> - <source><b>Skip</b><p>This skips a selectable changeset.</p></source> - <translation><b>Überspringen</b><p>Dies überspringt einen auswählbaren Änderungssatz.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1895"/> - <source>Import Patch</source> - <translation>Patch importieren</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <source>Serve project repository...</source> + <translation>Server für Projektrepository...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> + <source>Serve the project repository</source> + <translation>Server für das Projektrepository bereitstellen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> + <source><b>Serve project repository</b><p>This serves the project repository.</p></source> + <translation><b>Server für Projektrepository<b><p>Dies stellt einen Server für das Projektrepository zur Verfügung.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1674"/> + <source>Pull</source> + <translation>Pull</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/> + <source>The project should be reread. Do this now?</source> + <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Push new branch</source> + <translation>Neuen Zweig hochladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/> + <source>Push the current branch of the local project as a new named branch</source> + <translation>Lade den aktuellen Zweig als neuen benannten Zweig hoch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> + <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> + <translation><b>Neuen Zweig hochladen</b><p>Dies lädt den aktuellen Zweig als neuen benannten Zweig hoch.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> + <source>Rollback last transaction</source> + <translation>Letzte Transaktion zurücksetzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> + <source>Rollback the last transaction</source> + <translation>Die letzte Transaktion zurücksetzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1420"/> + <source>Extensions</source> + <translation>Erweiterungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <source>Edit user configuration</source> + <translation>Nutzerkonfiguration editieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <source>Edit user configuration...</source> + <translation>Nutzerkonfiguration editieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <source>Show an editor to edit the user configuration file</source> + <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation><b>Nutzerkonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> + <source>Edit repository configuration</source> + <translation>Repositorykonfiguration editieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> + <source>Edit repository configuration...</source> + <translation>Repositorykonfiguration editieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <source>Show an editor to edit the repository configuration file</source> + <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation><b>Repositorykonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/> + <source>Show combined configuration settings</source> + <translation>Zeige kombinierte Einstellungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/> + <source>Show combined configuration settings...</source> + <translation>Zeige kombinierte Einstellungen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Show the combined configuration settings from all configuration files</source> + <translation>Zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <translation><b>Zeige kombinierte Einstellungen</b><p>Dies zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <source>Skip...</source> + <translation>Überspringen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <source>Skip a selectable changeset</source> + <translation>Überspringe einen auswählbaren Änderungssatz</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <source><b>Skip</b><p>This skips a selectable changeset.</p></source> + <translation><b>Überspringen</b><p>Dies überspringt einen auswählbaren Änderungssatz.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1919"/> + <source>Import Patch</source> + <translation>Patch importieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951"/> <source>Import Patch...</source> <translation>Patch importieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> <source>Import a patch from a patch file</source> <translation>Einen Patch aus einer Patchdatei importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation><b>Patch importieren</b><p>Dies importiert einen Patch aus einer Patchdatei in das Projekt.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369"/> <source>Patch Management</source> <translation>Verwaltung von Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1939"/> <source>Revert Changes</source> <translation>Änderungen rückgängig machen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> <source>Export Patches...</source> <translation>Patches exportieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> - <source>Export revisions to patch files</source> - <translation>Änderungssätze in Patchdateien exportieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="961"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation><b>Patches exportieren</b><p>Dies exportiert Änderungssätze des projektes in Patchdateien.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source>Change Phase</source> - <translation>Phase ändern</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source>Change Phase...</source> - <translation>Phase ändern...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> - <source>Change the phase of revisions</source> - <translation>Ändert die Phase von Revisionen</translation> + <source>Export revisions to patch files</source> + <translation>Änderungssätze in Patchdateien exportieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation><b>Patches exportieren</b><p>Dies exportiert Änderungssätze des projektes in Patchdateien.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <source>Change Phase</source> + <translation>Phase ändern</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <source>Change Phase...</source> + <translation>Phase ändern...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <source>Change the phase of revisions</source> + <translation>Ändert die Phase von Revisionen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="989"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation><b>Phase ändern</b><p>Dies ändert die Phase von Revisionen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1959"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source>Copies changesets from another branch</source> <translation>Änderungssätze aus einem anderen Zweig kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation><b>Änderungssätze kopieren</b><p>Dies kopiert Änderungssätze aus einem anderen Zweig mit dem Nutzernamen, der Datums und der Änderungsmeldung des Originaländerungssatzes in das Arbeitsverzeichnis.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> <source>Continue Copying Session</source> <translation>Kopiersitzung fortsetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> <source>Continue the last copying session after conflicts were resolved</source> <translation>Setzt die letzte Kopiersitzung nach Lösung von Konflikten fort</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1020"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation><b>Kopiersitzung fortsetzen</b><p>Dies setzt die letzte Kopiersitzung nach Lösung von Konflikten fort.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1974"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> <source>Conflicts resolved</source> <translation>Konflikte gelöst</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> <source>Con&flicts resolved</source> <translation>&Konflikte gelöst</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source>Mark all conflicts of the local project as resolved</source> <translation>Markiert alle Konflikte des lokalen Projektes als gelöst</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation><b>Konflikte gelöst</b><p>Dies markiert alle Konflikte des lokalen Projektes als gelöst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Add</source> <translation>Hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Add...</source> <translation>Hinzufügen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> <source>Add a sub-repository</source> <translation>Ein Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation><b>Hinzufügen...</b><p>Ein Unterrepository zum Projekt hinzufügen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Remove</source> <translation>Entfernen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Remove...</source> <translation>Entfernen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source>Remove sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1080"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation><b>Entfernen...</b><p>Unterrepositorys aus dem Projekt löschen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1424"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440"/> <source>Sub-Repository</source> <translation>Unterrepository</translation> </message> @@ -36231,32 +36231,32 @@ <translation><b>Übersichtsinformationen anzeigen</b><p>Dies zeigt Übersichtsinformationen zum Status des Arbeitsverzeichnisses.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Create unversioned archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Create unversioned archive...</source> <translation>Erzeuge nicht versioniertes Archiv...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> <source>Create an unversioned archive from the repository</source> <translation>Erzeuge ein unversioniertes Archive des Repositories</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation><b>Erzeuge nicht versioniertes Archiv...</b><p>Dies erzeugt ein unversioniertes Archive des Repositories.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="917"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation><b>Letzte Transaktion zurücksetzen</b><p>Dies setzt die letzte Transaktion zurück. Transaktionen werden verwendet, um die Effekte aller Befehle, die neue Änderungssätze erzeugen oder vorhandene Änderungssätze in das Repository propagieren, zu kapseln. So arbeiten z.B. die folgenden Befehle transaktional und ihre Effekte können zurückgesetzt werden:<ul><li>commit</li><li>import</li><li>pull</li><li>push (mit diesem repository als Ziel)</li><li>unbundle</li></ul></p><p><strong>Dieser Befehl kann gefährlich sein. Bitte mit Vorsicht verwenden.</strong></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1328"/> <source>Administration</source> <translation>Verwaltung</translation> </message> @@ -36281,340 +36281,355 @@ <translation><b>Unterschiede anzeigen (erweitert)</b><p>Dies zeigt Unterschiede von Revisionen des Projektes an.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> - <source>Cancel uncommitted merge</source> - <translation>Zusammenführung abbrechen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> - <source>Cancel an uncommitted merge and lose all changes</source> - <translation>Bricht eine nicht eingepflegte Zusammenführung unter Verlust aller Änderungen ab</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> - <translation><b>Zusammenführung abbrechen</b><p>Dies bricht eine nicht eingepflegte Zusammenführung unter Verlust aller Änderungen ab.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> <source>List bookmarks</source> <translation>Lesezeichen listen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> <source>List bookmarks...</source> <translation>Lesezeichen listen …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/> <source>List bookmarks of the project</source> <translation>Listet Lesezeichen des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1112"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation><b>Lesezeichen listen</b><p>Dies listet die Lesezeichen des Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> <source>Define bookmark</source> <translation>Lesezeichen hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> <source>Define bookmark...</source> <translation>Lesezeichen hinzufügen …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/> <source>Define a bookmark for the project</source> <translation>Fügt dem Projekt ein Lesezeichen hinzu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1127"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation><b>Lesezeichen hinzufügen</b><p>Dies fügt dem Projekt ein Lesezeichen hinzu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Delete bookmark</source> <translation>Lesezeichen löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Delete bookmark...</source> <translation>Lesezeichen löschen …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/> <source>Delete a bookmark of the project</source> <translation>Löscht ein Lesezeichen aus dem Projekt</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation><b>Lesezeichen löschen</b><p>Dies löscht ein Lesezeichen aus dem Projekt.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Rename bookmark</source> <translation>Lesezeichen umbenennen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Rename bookmark...</source> <translation>Lesezeichen umbenennen …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source>Rename a bookmark of the project</source> <translation>Benennt ein Lesezeichen des Projektes um</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1157"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation><b>Lesezeichen umbenennen</b><p>Dies benennt ein Lesezeichen des Projektes um</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> <source>Move bookmark</source> <translation>Lesezeichen verschieben</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> <source>Move bookmark...</source> <translation>Lesezeichen verschieben …</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source>Move a bookmark of the project</source> <translation>Verschiebt ein Lesezeichen des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1172"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation><b>Lesezeichen verschieben</b><p>Dies verschiebt ein Lesezeichen des Projektes.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1180"/> <source>Show incoming bookmarks</source> <translation>Zeige eingehende Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source>Show a list of incoming bookmarks</source> <translation>Zeigt eine Liste eingehender Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1174"/> - <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> - <translation><b>Zeige eingehende Lesezeichen</b><p>Dies zeigt eine Liste neuer Lesezeichen, die in einem entfernten Repository verfügbar sind, an.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> - <source>Pull bookmark</source> - <translation>Lesezeichen herunterladen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1188"/> + <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> + <translation><b>Zeige eingehende Lesezeichen</b><p>Dies zeigt eine Liste neuer Lesezeichen, die in einem entfernten Repository verfügbar sind, an.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> + <source>Pull bookmark</source> + <translation>Lesezeichen herunterladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> <source>Pull a bookmark from a remote repository</source> <translation>Ein Lesezeichen von einem entfernten Repository herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1205"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Lesezeichen herunterladen</b><p>Dies lädt ein Lesezeichen von einem entfernten Repository in das lokale Repository herunter.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1229"/> <source>Show outgoing bookmarks</source> <translation>Zeige ausgehende Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source>Show a list of outgoing bookmarks</source> <translation>Zeigt eine Liste ausgehender Lesezeichen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223"/> - <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> - <translation><b>Zeige ausgehende Lesezeichen</b><p>Dies zeigt eine Liste neuer Lesezeichen, die im lokalen Repository verfügbar sind, an.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1232"/> - <source>Push bookmark</source> - <translation>Lesezeichen hochladen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1237"/> + <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> + <translation><b>Zeige ausgehende Lesezeichen</b><p>Dies zeigt eine Liste neuer Lesezeichen, die im lokalen Repository verfügbar sind, an.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1246"/> + <source>Push bookmark</source> + <translation>Lesezeichen hochladen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> <source>Push a bookmark to a remote repository</source> <translation>Ein Lesezeichen an ein entferntes Repository hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1254"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Lesezeichen hochladen</b><p>Dies lädt ein Lesezeichen vom lokalen Repository an ein entferntes Repository hoch.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399"/> + <source>Bookmarks</source> + <translation>Lesezeichen</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1383"/> - <source>Bookmarks</source> - <translation>Lesezeichen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Tags</source> <translation>Marken</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390"/> <source>Branches</source> <translation>Zweige</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> <source>Re-Merge</source> <translation>Neu zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation>Alle Dateien des Projektes mit nicht aufgelösten Konflikten erneut zusammenführen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> <source>Show conflicts</source> <translation>Zeige Konflikte</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> <source>Show conflicts...</source> <translation>Zeige Konflikte...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source>Show a dialog listing all files with conflicts</source> <translation>Zeige einen Dialog mit allen Dateien mit Konflikten an</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation><b>Zeige Konflikte</b><p>Dies zeigt einen Dialog mit allen Dateien, die einen Konflikt hatten oder noch haben.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> <source>Conflicts unresolved</source> <translation>Konflikte ungelöst</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> <source>Mark all conflicts of the local project as unresolved</source> <translation>Markiert alle Konflikte des lokalen Projektes als ungelöst</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation><b>Konflikte ungelöst</b><p>Dies markiert alle Konflikte des lokalen Projektes als ungelöst.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="445"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="459"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation><b>Neu zusammenführen</b><p>Dies führt alle Dateien des Projektes mit nicht aufgelösten Konflikten unter Verlust sämtlicher vorangegangener Versuche erneut zusammen.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1528"/> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> <source>Pull current bookmark</source> <translation>Aktuelles Lesezeichen herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source>Pull the current bookmark from a remote repository</source> <translation>Das aktuelle Lesezeichen von einem entfernten Repository herunterladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1221"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation><b>Aktuelles Lesezeichen herunterladen</b><p>Dies lädt das aktuelle Lesezeichen von einem entfernten Repository in das lokale Repository herunter.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1262"/> <source>Push current bookmark</source> <translation>Aktuelles Lesezeichen hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1267"/> <source>Push the current bookmark to a remote repository</source> <translation>Das aktuelle Lesezeichen an ein entferntes Repository hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> - <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> - <translation><b>Aktuelles Lesezeichen hochladen</b><p>Dies lädt das aktuelle Lesezeichen vom lokalen Repository an ein entferntes Repository hoch.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> - <source>Delete all backups</source> - <translation>Alle Backups löschen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> + <translation><b>Aktuelles Lesezeichen hochladen</b><p>Dies lädt das aktuelle Lesezeichen vom lokalen Repository an ein entferntes Repository hoch.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1279"/> + <source>Delete all backups</source> + <translation>Alle Backups löschen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1284"/> <source>Delete all backup bundles stored in the backup area</source> <translation>Löscht alle Backupdateien im Backupbereich</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1287"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation><b>Alle Backups löschen</b><p>Dies löscht alle Backupdateien im Backupbereich des Repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> - <source>Stop Copying Session</source> - <translation>Kopiersitzung anhalten</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1018"/> - <source>Stop the interrupted copying session</source> - <translation>Hält die unterbrochene Kopiersitzung an</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/> - <source>Abort Copying Session</source> - <translation>Kopiersitzung abbrechen</translation> + <source>Stop Copying Session</source> + <translation>Kopiersitzung anhalten</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> + <source>Stop the interrupted copying session</source> + <translation>Hält die unterbrochene Kopiersitzung an</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <source>Abort Copying Session</source> + <translation>Kopiersitzung abbrechen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> <source>Abort the interrupted copying session and rollback</source> <translation>Bricht die unterbrochene Kopiersitzung ab und rollt sie zurück</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> + <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> + <translation><b>Kopiersitzung abbrechen</b><p>Dies bricht die unterbrochene Kopiersitzung ab und rollt sie auf den Zustand vor dem Kopieren zurück.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1445"/> + <source>Merge Changesets</source> + <translation>Änderungen zusammenführen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1988"/> + <source>Copy Changesets (Stop)</source> + <translation>Änderungssätze kopieren (Stopp)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/> + <source>Copy Changesets (Abort)</source> + <translation>Änderungssätze kopieren (Abbruch)</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> - <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> - <translation><b>Kopiersitzung abbrechen</b><p>Dies bricht die unterbrochene Kopiersitzung ab und rollt sie auf den Zustand vor dem Kopieren zurück.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1429"/> - <source>Merge Changesets</source> - <translation>Änderungen zusammenführen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1964"/> - <source>Copy Changesets (Stop)</source> - <translation>Änderungssätze kopieren (Stopp)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/> - <source>Copy Changesets (Abort)</source> - <translation>Änderungssätze kopieren (Abbruch)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation><b>Kopiersitzung anhalten</b><p>Dies hält die unterbrochene Kopiersitzung an.</p></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> + <source>Commit Merge</source> + <translation>Zusammengeführte Änderungen einpflegen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> + <source>Commit a merge.</source> + <translation>Zusammengeführte Änderungen einpflegen.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> + <translation><b>Zusammengeführte Änderungen einpflegen</b><p>Dies pflegt ein Arbeitsverzeichnis mit zusammengeführten Änderungen ein.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <source>Abort Merge</source> + <translation>Zusammenführung abbrechen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> + <source>Abort an uncommitted merge and lose all changes</source> + <translation>Bricht eine nicht eingepflegte Zusammenführung unter Verlust aller Änderungen ab</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443"/> + <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> + <translation><b>Zusammenführung abbrechen</b><p>Dies bricht eine nicht eingepflegte Zusammenführung unter Verlust aller Änderungen ab.</p></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -47692,202 +47707,202 @@ <translation><p>Die Eingabeaufforderung kann nicht gestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="853"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="854"/> <source>Serial Device Connect</source> <translation>Serielle Verbindung</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="853"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="854"/> <source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source> <translation><p>Kann keine Verbindung zum Gerät an der seriellen Schnittstelle <b>{0}</b> herstellen.</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="898"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="899"/> <source>Run Script</source> <translation>Skript ausführen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="881"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="882"/> <source>There is no editor open. Abort...</source> <translation>Es ist kein Editor offen. Abbruch...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="889"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="890"/> <source>The current editor does not contain a script. Abort...</source> <translation>Der aktuelle Editortext enthält kein Skript. Abbruch...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="898"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="899"/> <source><p>Cannot run script.</p><p>Reason: {0}</p></source> <translation><p>Das Skript kann nicht ausgeführt werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="922"/> <source>Open Python File</source> <translation>Pythondatei öffnen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="922"/> <source>Python3 Files (*.py);;All Files (*)</source> <translation>Python3 Dateien (*.py);;Alle Dateien (*)</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="965"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="966"/> <source>Start Chart</source> <translation>Chart starten</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="965"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="966"/> <source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source> <translation><p>Das Chart kann nicht gestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="995"/> <source>Unsaved Chart Data</source> <translation>Nich gesicherte Chart Daten</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="995"/> <source>The chart contains unsaved data.</source> <translation>Das Chart enthält ungesicherte Daten.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/> <source>Start File Manager</source> <translation>Dateimanager starten</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/> <source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source> <translation><p>Der Dateimanager kann nicht gestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1097"/> <source>Show Version</source> <translation>Version anzeigen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1100"/> <source>Show Implementation</source> <translation>Implementierung anzeigen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> <source>Synchronize Time</source> <translation>Zeit synchronisieren</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1108"/> <source>Show Device Time</source> <translation>Gerätezeit anzeigen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1111"/> <source>Show Local Time</source> <translation>Lokale Zeit anzeigen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1339"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1361"/> <source>Compile Python File</source> <translation>Python Datei übersetzen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1359"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1381"/> <source>Compile Current Editor</source> <translation>Aktuellen Editor übersetzen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1132"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1135"/> <source><h3>Device Version Information</h3></source> <translation><h3>Versionsinformationen des Gerätes</h3></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1141"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1144"/> <source>No version information available.</source> <translation>Keine Versionsinformationen verfügbar.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1143"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1146"/> <source>Device Version Information</source> <translation>Versionsinformationen des Gerätes</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1166"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1169"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/> <source>Device Implementation Information</source> <translation>Informationen zur Implementierung</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/> <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source> <translation><h3>Informationen zur Implementierung</h3><p>Dieses Gerät enthält <b>{0} {1}</b>.</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> <source><p>The time of the connected device was synchronized with the local time.</p></source> <translation><p>Die Zeit des angeschlossenen Gerätes wurde mit der lokalen Zeit synchronisiert.</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1216"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1219"/> <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation><h3>Datum und Zeit des Gerätes</h3><table><tr><td><b>Datum</b></td><td>{0}</td></tr><tr><td><b>Zeit</b></td><td>{1}</td></tr></table></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1224"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1227"/> <source><h3>Device Date and Time</h3><p>{0}</p></source> <translation><h3>Datum und Zeit des Gerätes</h3><p>{0}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1238"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1241"/> <source>Device Date and Time</source> <translation>Datum und Zeit des Gerätes</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/> <source>Local Date and Time</source> <translation>Lokales Datum und Zeit</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/> <source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation><h3>Lokales Datum und Zeit</h3><table><tr><td><b>Datum</b></td><td>{0}</td></tr><tr><td><b>Zeit</b></td><td>{1}</td></tr></table></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/> <source>Error handling device</source> <translation>Fehler bei Gerätekommunikation</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/> <source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source> <translation><p>Es trat ein Fehler bei der Kommunikation mit dem Gerät auf.</p><p>Methode: {0}</p><p>Nachricht: {1}</p></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1291"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1313"/> <source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source> <translation>Der MicroPython Crosscompiler <b>mpy-cross</b> kann nicht gefunden werden. Stelle sicher, dass er im Suchpfad liegt oder konfiguriere ihn auf der MicroPython Konfigurationsseite.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1309"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1331"/> <source>Python Files (*.py);;All Files (*)</source> <translation>Python-Dateien (*.py);;Alle Dateien (*)</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1319"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1341"/> <source>The Python file <b>{0}</b> does not exist. Aborting...</source> <translation>Die Python Datei <b>{0}</b> existiert nicht. Abbruch...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1329"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1351"/> <source>'mpy-cross' Output</source> <translation>'mpy-cross' Ausgabe</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1352"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> <source>The current editor does not contain a Python file. Aborting...</source> <translation>Der aktuelle Editortext enthält keine Pythondatei. Abbruch...</translation> </message> @@ -47902,12 +47917,12 @@ <translation>Drücken, um einen Dateimanager zum ausgewählten Gerät zu öffnen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="978"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="979"/> <source>µPy Chart</source> <translation>µPy Chart</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1059"/> <source>µPy Files</source> <translation>µPy Dateien</translation> </message> @@ -78162,7 +78177,7 @@ <translation>Öffnet das Hilfe-Fenster</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3278"/> + <location filename="../UI/UserInterface.py" line="3285"/> <source>Unittest</source> <translation>Modultests</translation> </message> @@ -78182,7 +78197,7 @@ <translation>&Fenster</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3202"/> + <location filename="../UI/UserInterface.py" line="3209"/> <source>&Help</source> <translation>&Hilfe</translation> </message> @@ -78217,22 +78232,22 @@ <translation>Beenden der Entwicklungsumgebung</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3277"/> + <location filename="../UI/UserInterface.py" line="3284"/> <source>Tools</source> <translation>Werkzeuge</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5111"/> + <location filename="../UI/UserInterface.py" line="5118"/> <source>Help</source> <translation>Hilfe</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3189"/> + <location filename="../UI/UserInterface.py" line="3196"/> <source>&Toolbars</source> <translation>&Werkzeugleisten</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5237"/> + <location filename="../UI/UserInterface.py" line="5244"/> <source>Problem</source> <translation>Problem</translation> </message> @@ -78252,7 +78267,7 @@ <translation>&Was ist das?</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5426"/> + <location filename="../UI/UserInterface.py" line="5433"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> @@ -78272,7 +78287,7 @@ <translation>Ausgabefenster</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3279"/> + <location filename="../UI/UserInterface.py" line="3286"/> <source>Settings</source> <translation>Einstellungen</translation> </message> @@ -78322,7 +78337,7 @@ <translation>E&xtras</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3724"/> + <location filename="../UI/UserInterface.py" line="3731"/> <source>Report Bug</source> <translation>Fehler berichten</translation> </message> @@ -78342,7 +78357,7 @@ <translation><b>Fehler berichten...</b><p>Öffnet einen Dialog zum Senden eines Fehlerberichtes.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6313"/> + <location filename="../UI/UserInterface.py" line="6320"/> <source>Export Keyboard Shortcuts</source> <translation>Tastaturkurzbefehle exportieren</translation> </message> @@ -78362,7 +78377,7 @@ <translation><b>Tastaturkurzbefehle exportieren</b><p>Exportiert die Tastaturkurzbefehle der Applikation.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6337"/> + <location filename="../UI/UserInterface.py" line="6344"/> <source>Import Keyboard Shortcuts</source> <translation>Tastaturkurzbefehle importieren</translation> </message> @@ -78517,7 +78532,7 @@ <translation><b>Dateien Seite an Seite vergleichen</b><p>Öffnet einen Dialog zum Vergleich zweier Dateien und zur Anzeige des Ergebnisse Seite an Seite.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6902"/> <source>Drop Error</source> <translation>Drop-Fehler</translation> </message> @@ -78587,32 +78602,32 @@ <translation><b>Ansichtenprofile</b><p>Ansichtenprofile konfigurieren. Mit diesem Dialog kann die Sichtbarkeit der verschiedenen Fenster für die vorbestimmten Ansichtenprofile eingestellt werden.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5237"/> + <location filename="../UI/UserInterface.py" line="5244"/> <source><p>The file <b>{0}</b> does not exist or is zero length.</p></source> <translation><p>Die Datei <b>{0}</b> existiert nicht oder hat die Größe Null.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4961"/> + <location filename="../UI/UserInterface.py" line="4968"/> <source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Qt-Designer konnte nicht gestartet werden.<br>Stellen Sie sicher, dass es als <b>{0}</b> verfügbar ist.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5030"/> + <location filename="../UI/UserInterface.py" line="5037"/> <source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Qt-Linguist konnte nicht gestartet werden.<br>Stellen Sie sicher, dass es als <b>{0}</b> verfügbar ist.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5083"/> + <location filename="../UI/UserInterface.py" line="5090"/> <source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Qt-Assistant konnte nicht gestartet werden.<br>Stellen Sie sicher, dass es als <b>{0}</b> verfügbar ist.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5426"/> + <location filename="../UI/UserInterface.py" line="5433"/> <source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source> <translation><p>Der Werkzeugeeintrag <b>{0}</b> konnte nicht gestartet werden.<br>Stellen Sie sicher, dass er als <b>{1}</b> verfügbar ist.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6902"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> ist keine Datei.</p></translation> </message> @@ -78637,7 +78652,7 @@ <translation><b>UI-Vorschau</b><p>Starte die UI-Vorschau.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5193"/> + <location filename="../UI/UserInterface.py" line="5200"/> <source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Die UI-Vorschau konnte nicht gestartet werden.<br>Stellen Sie sicher, dass sie als <b>{0}</b> verfügbar ist.</p></translation> </message> @@ -78662,7 +78677,7 @@ <translation><b>Übersetzungsvorschau</b><p>Dies startet das Programm zur Vorschau von Übersetzungen.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5248"/> + <location filename="../UI/UserInterface.py" line="5255"/> <source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Die Übersetzungsvorschau konnte nicht gestartet werden.<br>Stellen Sie sicher, dass sie als <b>{0}</b> verfügbar ist.</p></translation> </message> @@ -78702,47 +78717,47 @@ <translation>Aufgabenanzeige</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6506"/> + <location filename="../UI/UserInterface.py" line="6513"/> <source>Save tasks</source> <translation>Aufgaben speichern</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6506"/> + <location filename="../UI/UserInterface.py" line="6513"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation><p>Die Aufgabendatei <b>{0}</b> konnte nicht geschrieben werden.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6535"/> + <location filename="../UI/UserInterface.py" line="6542"/> <source>Read tasks</source> <translation>Aufgaben lesen</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6535"/> + <location filename="../UI/UserInterface.py" line="6542"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation><p>Die Aufgabendatei <b>{0}</b> konnte nicht gelesen werden.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5111"/> + <location filename="../UI/UserInterface.py" line="5118"/> <source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source> <translation>Momentan ist kein Betrachter angegeben. Bitte benutzen Sie den Einstellungsdialog, um einen festzulegen.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5125"/> + <location filename="../UI/UserInterface.py" line="5132"/> <source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Der Betrachter konnte nicht gestartet werden.<br>Stellen Sie sicher, dass er als <b>{0}</b> verfügbar ist.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5901"/> + <location filename="../UI/UserInterface.py" line="5908"/> <source>Documentation Missing</source> <translation>Dokumentation fehlt</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5901"/> + <location filename="../UI/UserInterface.py" line="5908"/> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation><p>Der Dokumentationsstartpunkt „<b>{0}</b>“ konnte nicht gefunden werden.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3724"/> + <location filename="../UI/UserInterface.py" line="3731"/> <source>Email address or mail server address is empty. Please configure your Email settings in the Preferences Dialog.</source> <translation>E-Mail-Adresse oder Mailserver-Adresse sind leer. Bitte konfiguriere die E-Mail-Einstellungen im Einstellungsdialog.</translation> </message> @@ -78837,7 +78852,7 @@ <translation>Öffne die Eric-API-Dokumentation</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5145"/> + <location filename="../UI/UserInterface.py" line="5152"/> <source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source> <translation><p>Die Hilfeanzeige konnte nicht gestartet werden.<br>Stellen Sie sicher, dass sie als <b>hh</b> verfügbar ist.</p></translation> </message> @@ -78908,66 +78923,66 @@ <translation>&Einstellungen</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3281"/> + <location filename="../UI/UserInterface.py" line="3288"/> <source>Profiles</source> <translation>Profile</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4045"/> + <location filename="../UI/UserInterface.py" line="4052"/> <source>&Builtin Tools</source> <translation>&Eingebaute Werkzeuge</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5410"/> + <location filename="../UI/UserInterface.py" line="5417"/> <source>Starting process '{0} {1}'. </source> <translation>Starte Prozess „{0} {1}“. </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5502"/> + <location filename="../UI/UserInterface.py" line="5509"/> <source>Process '{0}' has exited. </source> <translation>Prozess „{0}“ ist beendet. </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5884"/> + <location filename="../UI/UserInterface.py" line="5891"/> <source>Documentation</source> <translation>Dokumentation</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5709"/> + <location filename="../UI/UserInterface.py" line="5716"/> <source><p>The PyQt4 documentation starting point has not been configured.</p></source> <translation><p>Der PyQt4-Dokumentations-Startpunkt ist nicht konfiguriert.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7264"/> + <location filename="../UI/UserInterface.py" line="7271"/> <source>Error during updates check</source> <translation>Fehler während der Aktualisierungsprüfung</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7245"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Update available</source> <translation>Aktualisierung verfügbar</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3664"/> + <location filename="../UI/UserInterface.py" line="3671"/> <source><h3>Version Numbers</h3><table></source> <translation><h3>Versionsnummern</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7302"/> + <location filename="../UI/UserInterface.py" line="7309"/> <source></table></source> <translation></table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4090"/> + <location filename="../UI/UserInterface.py" line="4097"/> <source>Configure Tool Groups ...</source> <translation>Konfiguriere Werkzeuggruppen...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4094"/> + <location filename="../UI/UserInterface.py" line="4101"/> <source>Configure current Tool Group ...</source> <translation>Konfiguriere aktuelle Werkzeuggruppe...</translation> </message> @@ -78982,22 +78997,22 @@ <translation>Zeige externe &Werkzeuge</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7264"/> + <location filename="../UI/UserInterface.py" line="7271"/> <source>Could not perform updates check.</source> <translation>Konnte keine Aktualisierungsprüfung durchführen.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7080"/> + <location filename="../UI/UserInterface.py" line="7087"/> <source>&Cancel</source> <translation>&Abbrechen</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7089"/> + <location filename="../UI/UserInterface.py" line="7096"/> <source>Trying host {0}</source> <translation>Prüfe Host {0}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7339"/> + <location filename="../UI/UserInterface.py" line="7346"/> <source>First time usage</source> <translation>Erstmalige Nutzung</translation> </message> @@ -79012,7 +79027,7 @@ <translation>Plugi&ns</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3282"/> + <location filename="../UI/UserInterface.py" line="3289"/> <source>Plugins</source> <translation>Plugins</translation> </message> @@ -79037,7 +79052,7 @@ <translation>&Plugininformationen...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4062"/> + <location filename="../UI/UserInterface.py" line="4069"/> <source>&Plugin Tools</source> <translation>&Pluginwerkzeuge</translation> </message> @@ -79057,12 +79072,12 @@ <translation><b>Plugin deinstallieren...</b><p>Dies öffnet einen Dialog zur Deinstallation eines Plugins.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4210"/> + <location filename="../UI/UserInterface.py" line="4217"/> <source>&Show all</source> <translation>Alle an&zeigen</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4212"/> + <location filename="../UI/UserInterface.py" line="4219"/> <source>&Hide all</source> <translation>Alle &ausblenden</translation> </message> @@ -79092,7 +79107,7 @@ <translation>Zeige die verfügbaren eric-Versionen</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7288"/> + <location filename="../UI/UserInterface.py" line="7295"/> <source><h3>Available versions</h3><table></source> <translation><h3>Verfügbare Versionen</h3><table></translation> </message> @@ -79172,22 +79187,22 @@ <translation>Lade Toolbarmanager...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3558"/> + <location filename="../UI/UserInterface.py" line="3565"/> <source>External Tools/{0}</source> <translation>Externe Werkzeuge/{0}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5371"/> + <location filename="../UI/UserInterface.py" line="5378"/> <source>External Tools</source> <translation>Externe Werkzeuge</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5362"/> + <location filename="../UI/UserInterface.py" line="5369"/> <source>No tool entry found for external tool '{0}' in tool group '{1}'.</source> <translation>Kein Eintrag für das externe Werkzeug „{0}“ in der Gruppe „{1}“ gefunden.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5371"/> + <location filename="../UI/UserInterface.py" line="5378"/> <source>No toolgroup entry '{0}' found.</source> <translation>Kein Werkzeuggruppeneintrag „{0}“ gefunden.</translation> </message> @@ -79202,32 +79217,32 @@ <translation>&Mehrfachprojektanzeige</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6631"/> + <location filename="../UI/UserInterface.py" line="6638"/> <source>Save session</source> <translation>Sitzung speichern</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6569"/> + <location filename="../UI/UserInterface.py" line="6576"/> <source><p>The session file <b>{0}</b> could not be written.</p></source> <translation><p>Die Sitzungsdatei <b>{0}</b> konnte nicht geschrieben werden.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6615"/> + <location filename="../UI/UserInterface.py" line="6622"/> <source>Read session</source> <translation>Sitzung lesen</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6615"/> + <location filename="../UI/UserInterface.py" line="6622"/> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation><p>Die Sitzungsdatei <b>{0}</b> konnte nicht gelesen werden.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3454"/> + <location filename="../UI/UserInterface.py" line="3461"/> <source><p>This part of the status bar displays the current editors encoding.</p></source> <translation><p>Dieser Teil der Statusleiste zeigt die Zeichenkodierung des aktuellen Editors an.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3468"/> + <location filename="../UI/UserInterface.py" line="3475"/> <source><p>This part of the status bar displays an indication of the current editors files writability.</p></source> <translation><p>Dieser Teil der Statusleiste zeigt an, ob die aktuelle Datei geschrieben werden kann.</p></translation> </message> @@ -79252,17 +79267,17 @@ <translation><b>Neue Funktion anfragen...</b><p>Öffnet einen Dialog, um eine Anfrage für eine neue Funktion zu senden.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3447"/> + <location filename="../UI/UserInterface.py" line="3454"/> <source><p>This part of the status bar displays the current editors language.</p></source> <translation><p>Dieser Teil der Statusleiste zeigt die Sprache des aktuellen Editors an.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3475"/> - <source><p>This part of the status bar displays the line number of the current editor.</p></source> - <translation><p>Dieser Teil der Statusleiste zeigt die Zeilennummer des aktuellen Editors an.</p></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="3482"/> + <source><p>This part of the status bar displays the line number of the current editor.</p></source> + <translation><p>Dieser Teil der Statusleiste zeigt die Zeilennummer des aktuellen Editors an.</p></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="3489"/> <source><p>This part of the status bar displays the cursor position of the current editor.</p></source> <translation><p>Dieser Teil der Statusleiste zeigt die Cursorposition des aktuellen Editors an.</p></translation> </message> @@ -79287,12 +79302,12 @@ <translation><b>Schalte das Fenster der Horizontalen Werkzeugbox um</b><p>Falls das Fenster der Horizontalen Werkzeugbox nicht sichtbar ist, wird es dargestellt. Ist es sichtbar, so wird es versteckt.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4009"/> + <location filename="../UI/UserInterface.py" line="4016"/> <source>Restart application</source> <translation>Anwendung neu starten</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4009"/> + <location filename="../UI/UserInterface.py" line="4016"/> <source>The application needs to be restarted. Do it now?</source> <translation>Die Anwendung muss neu gestartet werden. Jetzt durchführen?</translation> </message> @@ -79307,7 +79322,7 @@ <translation>Einstellungen...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3461"/> + <location filename="../UI/UserInterface.py" line="3468"/> <source><p>This part of the status bar displays the current editors eol setting.</p></source> <translation><p>Dieser Teil der Statusleiste zeigt die Zeilenendekodierung des aktuellen Editors an.</p></translation> </message> @@ -79437,7 +79452,7 @@ <translation><b>SQL-Browser</b><p>Erforsche eine SQL-Datenbank.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5269"/> + <location filename="../UI/UserInterface.py" line="5276"/> <source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Der SQL-Browser konnte nicht gestartet werden.<br>Stellen Sie sicher, dass er als <b>{0}</b> verfügbar ist.</p></translation> </message> @@ -79452,7 +79467,7 @@ <translation>&Icon-Editor...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5058"/> + <location filename="../UI/UserInterface.py" line="5065"/> <source>Qt 3 support</source> <translation>Qt3-Unterstützung</translation> </message> @@ -79502,7 +79517,7 @@ <translation>Alt+Shift+B</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6337"/> + <location filename="../UI/UserInterface.py" line="6344"/> <source>Keyboard shortcut file (*.e4k)</source> <translation>Tastaturkurzbefehlsdatei (*.e4k)</translation> </message> @@ -79542,27 +79557,27 @@ <translation><b>Python 2-Dokumentation</b><p>Zeigt die Python 2-Dokumentation an. Ist kein Dokumentationsverzeichnis konfiguriert, so ist der Ort, an dem die Python 2-Dokumentation gesucht wird, unter Windows das Verzeichnis <i>doc</i> unter dem Verzeichnis, in dem der konfigurierte Python 2-Interpreter installiert ist, und unter Unix das Verzeichnis <i>/usr/share/doc/packages/python/html/python-docs-html</i>. Um dies zu überschreiben, können Sie die Umgebungsvariable PYTHON2DOCDIR setzen.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7153"/> + <location filename="../UI/UserInterface.py" line="7160"/> <source>Error getting versions information</source> <translation>Fehler beim Herunterladen der Versionsinformationen</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7146"/> - <source>The versions information could not be downloaded. Please go online and try again.</source> - <translation>Die Versionsinformationen konnten nicht heruntergeladen werden. Bitte gehen Sie online und versuchen Sie es erneut.</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="6103"/> - <source>Open Browser</source> - <translation>Browser starten</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="6103"/> - <source>Could not start a web browser</source> - <translation>Der Systemwebbrowser konnte nicht gestartet werden</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7153"/> + <source>The versions information could not be downloaded. Please go online and try again.</source> + <translation>Die Versionsinformationen konnten nicht heruntergeladen werden. Bitte gehen Sie online und versuchen Sie es erneut.</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="6110"/> + <source>Open Browser</source> + <translation>Browser starten</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="6110"/> + <source>Could not start a web browser</source> + <translation>Der Systemwebbrowser konnte nicht gestartet werden</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7160"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation>Die Versionsinformationen konnten seit 7 Tagen nicht heruntergeladen werden. Bitte gehen Sie online und versuchen Sie es erneut.</translation> </message> @@ -79648,12 +79663,12 @@ <translation><b>Bildschirmfoto</b><p>Dies öffnet einen Dialog, um ein Bildschirmfoto aufzunehmen.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5339"/> + <location filename="../UI/UserInterface.py" line="5346"/> <source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Die Bildschirmfotoanwendung konnte nicht gestartet werden.<br>Stellen Sie sicher, dass sie als <b>{0}</b> verfügbar ist.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7358"/> + <location filename="../UI/UserInterface.py" line="7365"/> <source>Select Workspace Directory</source> <translation>Wähle Arbeitsverzeichnis</translation> </message> @@ -80018,7 +80033,7 @@ <translation>Öffne die PyQt5-Dokumentation</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5771"/> + <location filename="../UI/UserInterface.py" line="5778"/> <source><p>The PyQt5 documentation starting point has not been configured.</p></source> <translation><p>Der PyQt5-Dokumentations-Startpunkt ist nicht konfiguriert.</p></translation> </message> @@ -80028,7 +80043,7 @@ <translation><b>Python 3-Dokumentation</b><p>Zeigt die Python 3-Dokumentation an. Ist kein Dokumentationsverzeichnis konfiguriert, so ist der Ort, an dem die Python 3-Dokumentation gesucht wird, unter Windows das Verzeichnis <i>doc</i> unter dem Verzeichnis, in dem der Python 3-Interpreter installiert ist, und unter Unix das Verzeichnis <i>/usr/share/doc/packages/python/html</i>. Um dies zu überschreiben, können Sie die Umgebungsvariable PYTHON3DOCDIR setzen.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7080"/> + <location filename="../UI/UserInterface.py" line="7087"/> <source>%v/%m</source> <translation>%v/%m</translation> </message> @@ -80048,7 +80063,7 @@ <translation><b>Zeige Fehlerbericht...</b><p>Dies öffnet einen Dialog zur Anzeige des aktuellsten Fehlerberichtes.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7084"/> + <location filename="../UI/UserInterface.py" line="7091"/> <source>Version Check</source> <translation>Versionsprüfung</translation> </message> @@ -80119,27 +80134,27 @@ <translation><b>Eric-API-Dokumentation</b><p>Zeige die Eric-API-Dokumentation an. Der Pfad für die Dokumentation ist das Unterverzeichnis Documentation/Source im eric6-Installationverzeichnis.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5058"/> + <location filename="../UI/UserInterface.py" line="5065"/> <source>Qt v.3 is not supported by eric6.</source> <translation>Qt v.3 wird von eric6 nicht unterstützt.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7245"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation>Eine Aktualisierung auf <b>{0}</b> von Eric6 ist unter <b>{1}</b> verfügbar. Wollen Sie sie laden?</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7257"/> + <location filename="../UI/UserInterface.py" line="7264"/> <source>Eric6 is up to date</source> <translation>Eric6 ist aktuell</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7257"/> + <location filename="../UI/UserInterface.py" line="7264"/> <source>You are using the latest version of eric6</source> <translation>Sie verwenden die aktuellste Version von eric6</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7339"/> + <location filename="../UI/UserInterface.py" line="7346"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation>eric6 wurde noch nicht konfiguriert. Der Konfigurationsdialog wird nun gestartet.</translation> </message> @@ -80149,17 +80164,17 @@ <translation>Erzeuge Werkzeugleisten der Plug-ins...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4065"/> + <location filename="../UI/UserInterface.py" line="4072"/> <source>&User Tools</source> <translation>&Benutzerwerkzeuge</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4137"/> + <location filename="../UI/UserInterface.py" line="4144"/> <source>No User Tools Configured</source> <translation>Keine Benutzerwerkzeuge konfiguriert</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7100"/> + <location filename="../UI/UserInterface.py" line="7107"/> <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> <translation>Die Versionsinformationen konnten nicht heruntergeladen werden, da sie <b>nicht verbunden</b> sind. Bitte gehen Sie online und versuchen Sie es erneut.</translation> </message> @@ -80204,7 +80219,7 @@ <translation><b>Sitzung speichern...</b><p>Dies speichert die aktuelle Sitzung in eine Datei. Es wird ein Dialog zur Eingabe des Dateinamens geöffnet.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6653"/> + <location filename="../UI/UserInterface.py" line="6660"/> <source>Load session</source> <translation>Sitzung laden</translation> </message> @@ -80219,17 +80234,17 @@ <translation><b>Sitzung laden...</b><p>Dies lädt eine zuvor gesicherte Sitzung. Es wird ein Dialog zur Eingabe des Dateinamens geöffnet.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6653"/> + <location filename="../UI/UserInterface.py" line="6660"/> <source>eric6 Session Files (*.e5s)</source> <translation>eric6 Sitzungsdateien (*.e5s)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6700"/> + <location filename="../UI/UserInterface.py" line="6707"/> <source>Crash Session found!</source> <translation>Absturzsitzung gefunden!</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6700"/> + <location filename="../UI/UserInterface.py" line="6707"/> <source>A session file of a crashed session was found. Shall this session be restored?</source> <translation>Eine Sitzungsdatei einer abgestürzten Sitzung wurde gefunden. Soll diese Sitzung wiederhergestellt werden?</translation> </message> @@ -80244,17 +80259,17 @@ <translation>Initialisiere Plugins...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7233"/> + <location filename="../UI/UserInterface.py" line="7240"/> <source>Update Check</source> <translation>Aktualisierungsprüfung</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7233"/> + <location filename="../UI/UserInterface.py" line="7240"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation>Eric wurde direkt von vom Quelltext installiert. Eine Aktualitätsprüfung ist daher nicht möglich.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7223"/> + <location filename="../UI/UserInterface.py" line="7230"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation>Sie verwenden ein Snapshot-Release von eri6. Eine neueres, stabiles Release könnte verfügbar sein.</translation> </message> @@ -80309,7 +80324,7 @@ <translation><b>PySide2-Dokumentation</b><p>Zeige die PySide2-Dokumentation an. Abhängig von den Einstellungen wird Erics interner Hilfeanzeiger/Webbrowser, ein externer Webbrowser oder Qt Assistant verwendet.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5884"/> + <location filename="../UI/UserInterface.py" line="5891"/> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation><p>Der PySide{0}-Dokumentations-Startpunkt ist nicht konfiguriert.</p></translation> </message> @@ -80344,22 +80359,22 @@ <translation><b>Virtualenv Konfigurator</b><p>Dies öffnet einen Dialog zur Eingabe aller Parameter, die zur Erzeugung einer virtuellen Python Umgebung mittels virtualenv oder pyvenv benötigt werden.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3128"/> + <location filename="../UI/UserInterface.py" line="3135"/> <source>Left Side</source> <translation>Linke Seite</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3144"/> + <location filename="../UI/UserInterface.py" line="3151"/> <source>Bottom Side</source> <translation>Unterer Rand</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3155"/> + <location filename="../UI/UserInterface.py" line="3162"/> <source>Right Side</source> <translation>Rechte Seite</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3179"/> + <location filename="../UI/UserInterface.py" line="3186"/> <source>Plug-ins</source> <translation>Plugins</translation> </message> @@ -80385,17 +80400,17 @@ <translation><b>Neustart der Entwicklungsumgebung</b><p>Dies startet die Entwicklungsumgebung neu. Ungesicherte Änderungen können zuvor gesichert werden. Ein Python-Programm, das gerade debuggt wird, wird beendet und sämtliche Einstellungen werden gespeichert.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6058"/> + <location filename="../UI/UserInterface.py" line="6065"/> <source>Start Web Browser</source> <translation>Webbrowser starten</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6000"/> + <location filename="../UI/UserInterface.py" line="6007"/> <source>The eric6 web browser could not be started.</source> <translation>Der eric6 Webbrowser konnte nicht gestartet werden.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6058"/> + <location filename="../UI/UserInterface.py" line="6065"/> <source><p>The eric6 web browser is not started.</p><p>Reason: {0}</p></source> <translation><p>Der eric6 Webbrowser ist nicht gestartet.</p><p>Ursache: {0}</p></translation> </message> @@ -80410,7 +80425,7 @@ <translation>PyPI</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3493"/> + <location filename="../UI/UserInterface.py" line="3500"/> <source><p>This part of the status bar allows zooming the current editor or shell.</p></source> <translation><p>Dieser Teil der Statusleiste erlaubt das Zoomen des aktuellen Editors oder der Shell.</p></translation> </message> @@ -80484,6 +80499,11 @@ <source><b>MicroPython</b><p>This switches the input focus to the MicroPython window.</p></source> <translation><b>MicroPython</b><p>Dies schaltet den Eingabefokus auf das MicroPython-Fenster um.</p></translation> </message> + <message> + <location filename="../UI/UserInterface.py" line="3128"/> + <source>Central Park</source> + <translation>Mittelbereich</translation> + </message> </context> <context> <name>UserPropertiesDialog</name> @@ -90419,24 +90439,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1427"/> <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="2056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <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="2066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <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="1436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1447"/> <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> @@ -90445,24 +90465,24 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/> <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="2051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <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="2075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <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> @@ -90473,12 +90493,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1481"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -90489,14 +90509,14 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Kopf #{0}</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Vorgänger #{0}</b></td><td></td></tr>
--- a/eric6/i18n/eric6_empty.ts Fri Aug 23 13:23:22 2019 +0200 +++ b/eric6/i18n/eric6_empty.ts Fri Aug 23 13:23:36 2019 +0200 @@ -6876,11 +6876,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="597"/> - <source>&Start</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Debugger/DebugUI.py" line="599"/> <source>&Breakpoints</source> <translation type="unfinished"></translation> @@ -7071,6 +7066,11 @@ <source>No locals available.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Debugger/DebugUI.py" line="597"/> + <source>Sta&rt</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DebugViewer</name> @@ -31063,7 +31063,7 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -31093,420 +31093,420 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="555"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="630"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="691"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="760"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="954"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="984"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="995"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1061"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1098"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1361"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1787"/> <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/hg.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1983"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2223"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2377"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2401"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2414"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <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="2576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2544"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2550"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <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="2597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2608"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2647"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2656"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2687"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2802"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2782"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2829"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2822"/> <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="2886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2897"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2938"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2949"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2996"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3052"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3101"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3156"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3292"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3280"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3426"/> <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="3523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3689"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3755"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3797"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3903"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3947"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/> - <source>Canceling uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3113"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3126"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <source>Aborting uncommitted merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -35298,1110 +35298,1125 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> - <source>Cancel uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> - <source>Cancel an uncommitted merge and lose all changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="445"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="459"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> <source>Show conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> <source>Show conflicts...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>Tag in repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>&Tag in repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> - <source>Tag the local project in the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> - <source>List tags</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> - <source>List tags...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> - <source>List tags of the project</source> + <source>Tag the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>List branches</source> + <source>List tags</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>List branches...</source> + <source>List tags...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/> - <source>List branches of the project</source> + <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> - <source>Create branch</source> + <source>List branches</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <source>List branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> + <source>List branches of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> + <source>Create branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Create &branch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/> <source>Create a new branch for the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> <source>Close branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> - <source>Close the current branch of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> - <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> - <source>Show current branch</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> - <source>Show the current branch of the project</source> + <source>Close the current branch of the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> - <source>Switch</source> + <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <source>Show current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> + <source>Show the current branch of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source>S&witch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source>Switch the working directory to another revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> - <source>Cleanup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> - <source>Cleanu&p</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source>Cleanup the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source>Execute command</source> + <source>Cleanup</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source>E&xecute command...</source> + <source>Cleanu&p</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> - <source>Execute an arbitrary Mercurial command</source> + <source>Cleanup the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source>Execute command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source>E&xecute command...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> + <source>Execute an arbitrary Mercurial command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source>Configure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source>Configure...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> - <source>Edit user configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> - <source>Edit user configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Show an editor to edit the user configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> - <source>Edit repository configuration</source> + <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> - <source>Edit repository configuration...</source> + <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> - <source>Show an editor to edit the repository configuration file</source> + <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <source>Show an editor to edit the repository configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> - <source>Show paths</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> - <source>Show paths...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> - <source>Show the aliases for remote repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> - <source>Verify repository</source> + <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> - <source>Verify repository...</source> + <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> - <source>Verify the integrity of the repository</source> + <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Recover</source> + <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Recover...</source> + <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> - <source>Recover from an interrupted transaction</source> + <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> - <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> - <source>Identify</source> + <source>Recover</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> - <source>Identify...</source> + <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> - <source>Identify the project directory</source> + <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> - <source><b>Identify</b><p>This identifies the project directory.</p></source> + <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> - <source>Create .hgignore</source> + <source>Identify</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> + <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> - <source>Create a .hgignore file with default values</source> + <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> - <source>Create changegroup</source> + <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <source>Create .hgignore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/> <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1863"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Mark as "good"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Mark as "good"...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="830"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> - <source>Mark as "bad"</source> + <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> - <source>Mark as "bad"...</source> + <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> - <source>Mark a selectable changeset as bad</source> + <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> - <source>Skip</source> + <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> - <source>Skip...</source> + <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> - <source>Skip a selectable changeset</source> + <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> - <source><b>Skip</b><p>This skips a selectable changeset.</p></source> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> - <source>Reset</source> + <source>Skip</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> - <source>Reset the bisect search data</source> + <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> + <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> - <source>Back out changeset</source> + <source>Reset</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> - <source>Back out changes of an earlier changeset</source> + <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> - <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> - <source>Rollback last transaction</source> + <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> - <source>Rollback the last transaction</source> + <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> + <source>Rollback last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> + <source>Rollback the last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="917"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> - <source>Serve project repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> - <source>Serve the project repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> - <source><b>Serve project repository</b><p>This serves the project repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1895"/> - <source>Import Patch</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <source>Serve project repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> + <source>Serve the project repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> + <source><b>Serve project repository</b><p>This serves the project repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1919"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> - <source>Export revisions to patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="961"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source>Change Phase...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> - <source>Change the phase of revisions</source> + <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <source>Change Phase...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="989"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1959"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1020"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Add</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Add...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1080"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> <source>List bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> <source>List bookmarks...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/> <source>List bookmarks of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1112"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/> <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1127"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/> <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Rename bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Rename bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source>Rename a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1157"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> <source>Move bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> <source>Move bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1172"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1180"/> <source>Show incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1174"/> - <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> - <source>Pull bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1188"/> + <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> + <source>Pull bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1205"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1221"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1229"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223"/> - <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1232"/> - <source>Push bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1237"/> + <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1246"/> + <source>Push bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1254"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1262"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1267"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1328"/> <source>Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> - <source>Specials</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> - <source>Changegroup Management</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/> + <source>Specials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1362"/> + <source>Changegroup Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1375"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> - <source>Tags</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1374"/> - <source>Branches</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1383"/> + <source>Tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390"/> + <source>Branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399"/> <source>Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1420"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1424"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1528"/> <source>Mercurial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1674"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1939"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1974"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1279"/> <source>Delete all backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1284"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1287"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> - <source>Stop Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1018"/> - <source>Stop the interrupted copying session</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/> - <source>Abort Copying Session</source> + <source>Stop Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> + <source>Stop the interrupted copying session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <source>Abort Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> <source>Abort the interrupted copying session and rollback</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> + <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1445"/> + <source>Merge Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1988"/> + <source>Copy Changesets (Stop)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/> + <source>Copy Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> - <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1429"/> - <source>Merge Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1964"/> - <source>Copy Changesets (Stop)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/> - <source>Copy Changesets (Abort)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> + <source>Commit Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> + <source>Commit a merge.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <source>Abort Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> + <source>Abort an uncommitted merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443"/> + <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -47443,202 +47458,202 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="853"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="854"/> <source>Serial Device Connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="853"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="854"/> <source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="898"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="899"/> <source>Run Script</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="881"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="882"/> <source>There is no editor open. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="889"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="890"/> <source>The current editor does not contain a script. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="898"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="899"/> <source><p>Cannot run script.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="922"/> <source>Open Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="922"/> <source>Python3 Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="965"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="966"/> <source>Start Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="965"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="966"/> <source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="995"/> <source>Unsaved Chart Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="995"/> <source>The chart contains unsaved data.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/> <source>Start File Manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/> <source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1097"/> <source>Show Version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1100"/> <source>Show Implementation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> <source>Synchronize Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1108"/> <source>Show Device Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1111"/> <source>Show Local Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1339"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1361"/> <source>Compile Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1359"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1381"/> <source>Compile Current Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1132"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1135"/> <source><h3>Device Version Information</h3></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1141"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1144"/> <source>No version information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1143"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1146"/> <source>Device Version Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1166"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1169"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/> <source>Device Implementation Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/> <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> <source><p>The time of the connected device was synchronized with the local time.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1216"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1219"/> <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1224"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1227"/> <source><h3>Device Date and Time</h3><p>{0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1238"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1241"/> <source>Device Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/> <source>Local Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/> <source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/> <source>Error handling device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/> <source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1291"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1313"/> <source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1309"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1331"/> <source>Python Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1319"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1341"/> <source>The Python file <b>{0}</b> does not exist. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1329"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1351"/> <source>'mpy-cross' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1352"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> <source>The current editor does not contain a Python file. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -47653,12 +47668,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="978"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="979"/> <source>µPy Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1059"/> <source>µPy Files</source> <translation type="unfinished"></translation> </message> @@ -78219,7 +78234,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3724"/> + <location filename="../UI/UserInterface.py" line="3731"/> <source>Report Bug</source> <translation type="unfinished"></translation> </message> @@ -78259,7 +78274,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3278"/> + <location filename="../UI/UserInterface.py" line="3285"/> <source>Unittest</source> <translation type="unfinished"></translation> </message> @@ -78744,7 +78759,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6313"/> + <location filename="../UI/UserInterface.py" line="6320"/> <source>Export Keyboard Shortcuts</source> <translation type="unfinished"></translation> </message> @@ -78764,7 +78779,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6337"/> + <location filename="../UI/UserInterface.py" line="6344"/> <source>Import Keyboard Shortcuts</source> <translation type="unfinished"></translation> </message> @@ -79114,7 +79129,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3189"/> + <location filename="../UI/UserInterface.py" line="3196"/> <source>&Toolbars</source> <translation type="unfinished"></translation> </message> @@ -79129,419 +79144,419 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3202"/> + <location filename="../UI/UserInterface.py" line="3209"/> <source>&Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3277"/> + <location filename="../UI/UserInterface.py" line="3284"/> <source>Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3279"/> + <location filename="../UI/UserInterface.py" line="3286"/> <source>Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5111"/> + <location filename="../UI/UserInterface.py" line="5118"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3281"/> + <location filename="../UI/UserInterface.py" line="3288"/> <source>Profiles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3282"/> + <location filename="../UI/UserInterface.py" line="3289"/> <source>Plugins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3447"/> - <source><p>This part of the status bar displays the current editors language.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="3454"/> - <source><p>This part of the status bar displays the current editors encoding.</p></source> + <source><p>This part of the status bar displays the current editors language.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../UI/UserInterface.py" line="3461"/> - <source><p>This part of the status bar displays the current editors eol setting.</p></source> + <source><p>This part of the status bar displays the current editors encoding.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../UI/UserInterface.py" line="3468"/> - <source><p>This part of the status bar displays an indication of the current editors files writability.</p></source> + <source><p>This part of the status bar displays the current editors eol setting.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../UI/UserInterface.py" line="3475"/> - <source><p>This part of the status bar displays the line number of the current editor.</p></source> + <source><p>This part of the status bar displays an indication of the current editors files writability.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../UI/UserInterface.py" line="3482"/> + <source><p>This part of the status bar displays the line number of the current editor.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="3489"/> <source><p>This part of the status bar displays the cursor position of the current editor.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3558"/> + <location filename="../UI/UserInterface.py" line="3565"/> <source>External Tools/{0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3664"/> + <location filename="../UI/UserInterface.py" line="3671"/> <source><h3>Version Numbers</h3><table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7302"/> + <location filename="../UI/UserInterface.py" line="7309"/> <source></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3724"/> + <location filename="../UI/UserInterface.py" line="3731"/> <source>Email address or mail server address is empty. Please configure your Email settings in the Preferences Dialog.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4009"/> + <location filename="../UI/UserInterface.py" line="4016"/> <source>Restart application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4009"/> + <location filename="../UI/UserInterface.py" line="4016"/> <source>The application needs to be restarted. Do it now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4045"/> + <location filename="../UI/UserInterface.py" line="4052"/> <source>&Builtin Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4062"/> + <location filename="../UI/UserInterface.py" line="4069"/> <source>&Plugin Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4065"/> + <location filename="../UI/UserInterface.py" line="4072"/> <source>&User Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4090"/> + <location filename="../UI/UserInterface.py" line="4097"/> <source>Configure Tool Groups ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4094"/> + <location filename="../UI/UserInterface.py" line="4101"/> <source>Configure current Tool Group ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4137"/> + <location filename="../UI/UserInterface.py" line="4144"/> <source>No User Tools Configured</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4210"/> + <location filename="../UI/UserInterface.py" line="4217"/> <source>&Show all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4212"/> + <location filename="../UI/UserInterface.py" line="4219"/> <source>&Hide all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5058"/> + <location filename="../UI/UserInterface.py" line="5065"/> <source>Qt 3 support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5058"/> + <location filename="../UI/UserInterface.py" line="5065"/> <source>Qt v.3 is not supported by eric6.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5237"/> + <location filename="../UI/UserInterface.py" line="5244"/> <source>Problem</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5237"/> + <location filename="../UI/UserInterface.py" line="5244"/> <source><p>The file <b>{0}</b> does not exist or is zero length.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5426"/> + <location filename="../UI/UserInterface.py" line="5433"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4961"/> + <location filename="../UI/UserInterface.py" line="4968"/> <source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5030"/> + <location filename="../UI/UserInterface.py" line="5037"/> <source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5083"/> + <location filename="../UI/UserInterface.py" line="5090"/> <source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5111"/> + <location filename="../UI/UserInterface.py" line="5118"/> <source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5125"/> + <location filename="../UI/UserInterface.py" line="5132"/> <source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5145"/> + <location filename="../UI/UserInterface.py" line="5152"/> <source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5193"/> + <location filename="../UI/UserInterface.py" line="5200"/> <source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5248"/> + <location filename="../UI/UserInterface.py" line="5255"/> <source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5269"/> + <location filename="../UI/UserInterface.py" line="5276"/> <source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5339"/> + <location filename="../UI/UserInterface.py" line="5346"/> <source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5371"/> + <location filename="../UI/UserInterface.py" line="5378"/> <source>External Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5362"/> + <location filename="../UI/UserInterface.py" line="5369"/> <source>No tool entry found for external tool '{0}' in tool group '{1}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5371"/> + <location filename="../UI/UserInterface.py" line="5378"/> <source>No toolgroup entry '{0}' found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5410"/> + <location filename="../UI/UserInterface.py" line="5417"/> <source>Starting process '{0} {1}'. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5426"/> + <location filename="../UI/UserInterface.py" line="5433"/> <source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5502"/> + <location filename="../UI/UserInterface.py" line="5509"/> <source>Process '{0}' has exited. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5901"/> + <location filename="../UI/UserInterface.py" line="5908"/> <source>Documentation Missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5901"/> + <location filename="../UI/UserInterface.py" line="5908"/> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5884"/> + <location filename="../UI/UserInterface.py" line="5891"/> <source>Documentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5709"/> + <location filename="../UI/UserInterface.py" line="5716"/> <source><p>The PyQt4 documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5771"/> + <location filename="../UI/UserInterface.py" line="5778"/> <source><p>The PyQt5 documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6103"/> + <location filename="../UI/UserInterface.py" line="6110"/> <source>Open Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6103"/> + <location filename="../UI/UserInterface.py" line="6110"/> <source>Could not start a web browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6337"/> + <location filename="../UI/UserInterface.py" line="6344"/> <source>Keyboard shortcut file (*.e4k)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6506"/> + <location filename="../UI/UserInterface.py" line="6513"/> <source>Save tasks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6506"/> + <location filename="../UI/UserInterface.py" line="6513"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6535"/> + <location filename="../UI/UserInterface.py" line="6542"/> <source>Read tasks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6535"/> + <location filename="../UI/UserInterface.py" line="6542"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6631"/> + <location filename="../UI/UserInterface.py" line="6638"/> <source>Save session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6569"/> + <location filename="../UI/UserInterface.py" line="6576"/> <source><p>The session file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6615"/> + <location filename="../UI/UserInterface.py" line="6622"/> <source>Read session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6615"/> + <location filename="../UI/UserInterface.py" line="6622"/> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6902"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6902"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7080"/> + <location filename="../UI/UserInterface.py" line="7087"/> <source>&Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7080"/> + <location filename="../UI/UserInterface.py" line="7087"/> <source>%v/%m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7084"/> + <location filename="../UI/UserInterface.py" line="7091"/> <source>Version Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7089"/> + <location filename="../UI/UserInterface.py" line="7096"/> <source>Trying host {0}</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../UI/UserInterface.py" line="7160"/> + <source>Error getting versions information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7107"/> + <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../UI/UserInterface.py" line="7153"/> - <source>Error getting versions information</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="7100"/> - <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="7146"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7153"/> + <location filename="../UI/UserInterface.py" line="7160"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7245"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Update available</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7245"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7257"/> + <location filename="../UI/UserInterface.py" line="7264"/> <source>Eric6 is up to date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7257"/> - <source>You are using the latest version of eric6</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7264"/> + <source>You are using the latest version of eric6</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7271"/> <source>Error during updates check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7264"/> + <location filename="../UI/UserInterface.py" line="7271"/> <source>Could not perform updates check.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7288"/> + <location filename="../UI/UserInterface.py" line="7295"/> <source><h3>Available versions</h3><table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7339"/> + <location filename="../UI/UserInterface.py" line="7346"/> <source>First time usage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7339"/> + <location filename="../UI/UserInterface.py" line="7346"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7358"/> + <location filename="../UI/UserInterface.py" line="7365"/> <source>Select Workspace Directory</source> <translation type="unfinished"></translation> </message> @@ -79556,7 +79571,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6653"/> + <location filename="../UI/UserInterface.py" line="6660"/> <source>Load session</source> <translation type="unfinished"></translation> </message> @@ -79571,17 +79586,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6653"/> + <location filename="../UI/UserInterface.py" line="6660"/> <source>eric6 Session Files (*.e5s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6700"/> + <location filename="../UI/UserInterface.py" line="6707"/> <source>Crash Session found!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6700"/> + <location filename="../UI/UserInterface.py" line="6707"/> <source>A session file of a crashed session was found. Shall this session be restored?</source> <translation type="unfinished"></translation> </message> @@ -79596,17 +79611,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7233"/> + <location filename="../UI/UserInterface.py" line="7240"/> <source>Update Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7233"/> + <location filename="../UI/UserInterface.py" line="7240"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7223"/> + <location filename="../UI/UserInterface.py" line="7230"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation type="unfinished"></translation> </message> @@ -79661,7 +79676,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5884"/> + <location filename="../UI/UserInterface.py" line="5891"/> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> @@ -79696,22 +79711,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3128"/> + <location filename="../UI/UserInterface.py" line="3135"/> <source>Left Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3144"/> + <location filename="../UI/UserInterface.py" line="3151"/> <source>Bottom Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3155"/> + <location filename="../UI/UserInterface.py" line="3162"/> <source>Right Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3179"/> + <location filename="../UI/UserInterface.py" line="3186"/> <source>Plug-ins</source> <translation type="unfinished"></translation> </message> @@ -79737,17 +79752,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6058"/> + <location filename="../UI/UserInterface.py" line="6065"/> <source>Start Web Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6000"/> + <location filename="../UI/UserInterface.py" line="6007"/> <source>The eric6 web browser could not be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6058"/> + <location filename="../UI/UserInterface.py" line="6065"/> <source><p>The eric6 web browser is not started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -79762,7 +79777,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3493"/> + <location filename="../UI/UserInterface.py" line="3500"/> <source><p>This part of the status bar allows zooming the current editor or shell.</p></source> <translation type="unfinished"></translation> </message> @@ -79836,6 +79851,11 @@ <source><b>MicroPython</b><p>This switches the input focus to the MicroPython window.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../UI/UserInterface.py" line="3128"/> + <source>Central Park</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name> @@ -89703,35 +89723,35 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1427"/> <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="2056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <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="2061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <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="1436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1447"/> <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="1470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1481"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -89742,35 +89762,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/> <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="2051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <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="2075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr>
--- a/eric6/i18n/eric6_en.ts Fri Aug 23 13:23:22 2019 +0200 +++ b/eric6/i18n/eric6_en.ts Fri Aug 23 13:23:36 2019 +0200 @@ -6868,11 +6868,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Debugger/DebugUI.py" line="597"/> - <source>&Start</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Debugger/DebugUI.py" line="599"/> <source>&Breakpoints</source> <translation type="unfinished"></translation> @@ -7078,6 +7073,11 @@ <source>No locals available.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Debugger/DebugUI.py" line="597"/> + <source>Sta&rt</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DebugViewer</name> @@ -31090,7 +31090,7 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -31120,420 +31120,420 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="630"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="691"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="760"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1061"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1361"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1983"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2223"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2377"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2401"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2414"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <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="2576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2544"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2550"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <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="2597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2608"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2647"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2656"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2687"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2802"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2782"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2829"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2822"/> <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="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="555"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3426"/> <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="3523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2897"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2938"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2949"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2996"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3052"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3101"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3292"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3280"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="984"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="995"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3156"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1787"/> <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/hg.py" line="943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="954"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3689"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3755"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3797"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3903"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3947"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1098"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/> - <source>Canceling uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3113"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3126"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <source>Aborting uncommitted merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -35280,742 +35280,742 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>Tag in repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>&Tag in repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> - <source>Tag the local project in the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> - <source>List tags</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> - <source>List tags...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> - <source>List tags of the project</source> + <source>Tag the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>List branches</source> + <source>List tags</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>List branches...</source> + <source>List tags...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/> - <source>List branches of the project</source> + <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> - <source>Create branch</source> + <source>List branches</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <source>List branches...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> + <source>List branches of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> + <source>Create branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Create &branch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/> <source>Create a new branch for the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> <source>Close branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> - <source>Close the current branch of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> - <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> - <source>Show current branch</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> - <source>Show the current branch of the project</source> + <source>Close the current branch of the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <source>Show current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> + <source>Show the current branch of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source>S&witch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source>Switch the working directory to another revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> - <source>Cleanup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> - <source>Cleanu&p</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source>Cleanup the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source>Execute command</source> + <source>Cleanup</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source>E&xecute command...</source> + <source>Cleanu&p</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> - <source>Execute an arbitrary Mercurial command</source> + <source>Cleanup the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source>Execute command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source>E&xecute command...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> + <source>Execute an arbitrary Mercurial command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source>Configure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source>Configure...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> - <source>Show paths</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> - <source>Show paths...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> - <source>Show the aliases for remote repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> - <source>Verify repository</source> + <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> - <source>Verify repository...</source> + <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> - <source>Verify the integrity of the repository</source> + <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Recover</source> + <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Recover...</source> + <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> - <source>Recover from an interrupted transaction</source> + <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> - <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> - <source>Identify</source> + <source>Recover</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> - <source>Identify...</source> + <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> - <source>Identify the project directory</source> + <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> - <source><b>Identify</b><p>This identifies the project directory.</p></source> + <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> - <source>Create .hgignore</source> + <source>Identify</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> + <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> - <source>Create a .hgignore file with default values</source> + <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> - <source>Create changegroup</source> + <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <source>Create .hgignore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/> <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1863"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Mark as "good"...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="830"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> - <source>Mark as "bad"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> - <source>Mark as "bad"...</source> + <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> - <source>Mark a selectable changeset as bad</source> + <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> + <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> - <source>Skip</source> + <source>Mark as "bad"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> + <source>Mark a selectable changeset as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> - <source>Reset</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> - <source>Reset the bisect search data</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> + <source>Skip</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> - <source>Back out changeset</source> + <source>Reset</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> - <source>Back out changes of an earlier changeset</source> + <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> - <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> - <source>Serve project repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> - <source>Serve project repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> - <source>Serve the project repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> - <source><b>Serve project repository</b><p>This serves the project repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> - <source>Specials</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> - <source>Changegroup Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359"/> - <source>Bisect</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656"/> - <source>Pull</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/> - <source>The project should be reread. Do this now?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> - <source>Push new branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> - <source>Push the current branch of the local project as a new named branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> - <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> - <source>Rollback last transaction</source> + <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <source>Back out changes of an earlier changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <source>Serve project repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <source>Serve project repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> + <source>Serve the project repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> + <source><b>Serve project repository</b><p>This serves the project repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/> + <source>Specials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1362"/> + <source>Changegroup Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1375"/> + <source>Bisect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1674"/> + <source>Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Push new branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/> + <source>Push the current branch of the local project as a new named branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> + <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> + <source>Rollback last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1420"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> - <source>Edit user configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> - <source>Edit user configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Show an editor to edit the user configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> - <source>Edit repository configuration</source> + <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> - <source>Edit repository configuration...</source> + <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> - <source>Show an editor to edit the repository configuration file</source> + <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <source>Show an editor to edit the repository configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1919"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1939"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> - <source>Export revisions to patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="961"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source>Change Phase...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> - <source>Change the phase of revisions</source> + <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <source>Change Phase...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="989"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1959"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1020"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1974"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Add</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Add...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1080"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1424"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -36045,32 +36045,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="917"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1328"/> <source>Administration</source> <translation type="unfinished"></translation> </message> @@ -36095,340 +36095,355 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> - <source>Cancel uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> - <source>Cancel an uncommitted merge and lose all changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> <source>List bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> <source>List bookmarks...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/> <source>List bookmarks of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1112"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/> <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1127"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/> <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Rename bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Rename bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source>Rename a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1157"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> <source>Move bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> <source>Move bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1172"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1180"/> <source>Show incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1174"/> - <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> - <source>Pull bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1188"/> + <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> + <source>Pull bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1205"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1229"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223"/> - <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1232"/> - <source>Push bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1237"/> + <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1246"/> + <source>Push bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1254"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399"/> + <source>Bookmarks</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1383"/> - <source>Bookmarks</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> <source>Show conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> <source>Show conflicts...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="445"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="459"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1528"/> <source>Mercurial</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1221"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1262"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1267"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> - <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> - <source>Delete all backups</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1279"/> + <source>Delete all backups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1284"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1287"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> - <source>Stop Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1018"/> - <source>Stop the interrupted copying session</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/> - <source>Abort Copying Session</source> + <source>Stop Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> + <source>Stop the interrupted copying session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <source>Abort Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> <source>Abort the interrupted copying session and rollback</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> + <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1445"/> + <source>Merge Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1988"/> + <source>Copy Changesets (Stop)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/> + <source>Copy Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> - <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1429"/> - <source>Merge Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1964"/> - <source>Copy Changesets (Stop)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/> - <source>Copy Changesets (Abort)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> + <source>Commit Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> + <source>Commit a merge.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <source>Abort Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> + <source>Abort an uncommitted merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443"/> + <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -47489,202 +47504,202 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="853"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="854"/> <source>Serial Device Connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="853"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="854"/> <source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="898"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="899"/> <source>Run Script</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="881"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="882"/> <source>There is no editor open. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="889"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="890"/> <source>The current editor does not contain a script. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="898"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="899"/> <source><p>Cannot run script.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="922"/> <source>Open Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="922"/> <source>Python3 Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="965"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="966"/> <source>Start Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="965"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="966"/> <source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="995"/> <source>Unsaved Chart Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="995"/> <source>The chart contains unsaved data.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/> <source>Start File Manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/> <source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1097"/> <source>Show Version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1100"/> <source>Show Implementation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> <source>Synchronize Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1108"/> <source>Show Device Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1111"/> <source>Show Local Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1339"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1361"/> <source>Compile Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1359"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1381"/> <source>Compile Current Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1132"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1135"/> <source><h3>Device Version Information</h3></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1141"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1144"/> <source>No version information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1143"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1146"/> <source>Device Version Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1166"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1169"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/> <source>Device Implementation Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/> <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> <source><p>The time of the connected device was synchronized with the local time.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1216"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1219"/> <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1224"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1227"/> <source><h3>Device Date and Time</h3><p>{0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1238"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1241"/> <source>Device Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/> <source>Local Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/> <source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/> <source>Error handling device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/> <source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1291"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1313"/> <source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1309"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1331"/> <source>Python Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1319"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1341"/> <source>The Python file <b>{0}</b> does not exist. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1329"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1351"/> <source>'mpy-cross' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1352"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> <source>The current editor does not contain a Python file. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -47699,12 +47714,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="978"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="979"/> <source>µPy Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1059"/> <source>µPy Files</source> <translation type="unfinished"></translation> </message> @@ -77950,7 +77965,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3724"/> + <location filename="../UI/UserInterface.py" line="3731"/> <source>Report Bug</source> <translation type="unfinished"></translation> </message> @@ -77990,7 +78005,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3278"/> + <location filename="../UI/UserInterface.py" line="3285"/> <source>Unittest</source> <translation type="unfinished"></translation> </message> @@ -78335,7 +78350,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6313"/> + <location filename="../UI/UserInterface.py" line="6320"/> <source>Export Keyboard Shortcuts</source> <translation type="unfinished"></translation> </message> @@ -78355,7 +78370,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6337"/> + <location filename="../UI/UserInterface.py" line="6344"/> <source>Import Keyboard Shortcuts</source> <translation type="unfinished"></translation> </message> @@ -78570,7 +78585,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3189"/> + <location filename="../UI/UserInterface.py" line="3196"/> <source>&Toolbars</source> <translation type="unfinished"></translation> </message> @@ -78585,329 +78600,329 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3202"/> + <location filename="../UI/UserInterface.py" line="3209"/> <source>&Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3277"/> + <location filename="../UI/UserInterface.py" line="3284"/> <source>Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3279"/> + <location filename="../UI/UserInterface.py" line="3286"/> <source>Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5111"/> + <location filename="../UI/UserInterface.py" line="5118"/> <source>Help</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3281"/> + <location filename="../UI/UserInterface.py" line="3288"/> <source>Profiles</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3282"/> + <location filename="../UI/UserInterface.py" line="3289"/> <source>Plugins</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3447"/> - <source><p>This part of the status bar displays the current editors language.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="3454"/> - <source><p>This part of the status bar displays the current editors encoding.</p></source> + <source><p>This part of the status bar displays the current editors language.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../UI/UserInterface.py" line="3461"/> - <source><p>This part of the status bar displays the current editors eol setting.</p></source> + <source><p>This part of the status bar displays the current editors encoding.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../UI/UserInterface.py" line="3468"/> - <source><p>This part of the status bar displays an indication of the current editors files writability.</p></source> + <source><p>This part of the status bar displays the current editors eol setting.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../UI/UserInterface.py" line="3475"/> - <source><p>This part of the status bar displays the line number of the current editor.</p></source> + <source><p>This part of the status bar displays an indication of the current editors files writability.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../UI/UserInterface.py" line="3482"/> + <source><p>This part of the status bar displays the line number of the current editor.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="3489"/> <source><p>This part of the status bar displays the cursor position of the current editor.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3558"/> + <location filename="../UI/UserInterface.py" line="3565"/> <source>External Tools/{0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3664"/> + <location filename="../UI/UserInterface.py" line="3671"/> <source><h3>Version Numbers</h3><table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7302"/> + <location filename="../UI/UserInterface.py" line="7309"/> <source></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3724"/> + <location filename="../UI/UserInterface.py" line="3731"/> <source>Email address or mail server address is empty. Please configure your Email settings in the Preferences Dialog.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4009"/> + <location filename="../UI/UserInterface.py" line="4016"/> <source>Restart application</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4009"/> + <location filename="../UI/UserInterface.py" line="4016"/> <source>The application needs to be restarted. Do it now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4090"/> + <location filename="../UI/UserInterface.py" line="4097"/> <source>Configure Tool Groups ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4094"/> + <location filename="../UI/UserInterface.py" line="4101"/> <source>Configure current Tool Group ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4045"/> + <location filename="../UI/UserInterface.py" line="4052"/> <source>&Builtin Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4062"/> + <location filename="../UI/UserInterface.py" line="4069"/> <source>&Plugin Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4210"/> + <location filename="../UI/UserInterface.py" line="4217"/> <source>&Show all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4212"/> + <location filename="../UI/UserInterface.py" line="4219"/> <source>&Hide all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5058"/> + <location filename="../UI/UserInterface.py" line="5065"/> <source>Qt 3 support</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5237"/> + <location filename="../UI/UserInterface.py" line="5244"/> <source>Problem</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5237"/> + <location filename="../UI/UserInterface.py" line="5244"/> <source><p>The file <b>{0}</b> does not exist or is zero length.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5426"/> + <location filename="../UI/UserInterface.py" line="5433"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4961"/> + <location filename="../UI/UserInterface.py" line="4968"/> <source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5030"/> + <location filename="../UI/UserInterface.py" line="5037"/> <source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5083"/> + <location filename="../UI/UserInterface.py" line="5090"/> <source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5111"/> + <location filename="../UI/UserInterface.py" line="5118"/> <source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5125"/> + <location filename="../UI/UserInterface.py" line="5132"/> <source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5145"/> + <location filename="../UI/UserInterface.py" line="5152"/> <source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5193"/> + <location filename="../UI/UserInterface.py" line="5200"/> <source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5248"/> + <location filename="../UI/UserInterface.py" line="5255"/> <source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5269"/> + <location filename="../UI/UserInterface.py" line="5276"/> <source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5371"/> + <location filename="../UI/UserInterface.py" line="5378"/> <source>External Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5362"/> + <location filename="../UI/UserInterface.py" line="5369"/> <source>No tool entry found for external tool '{0}' in tool group '{1}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5371"/> + <location filename="../UI/UserInterface.py" line="5378"/> <source>No toolgroup entry '{0}' found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5410"/> + <location filename="../UI/UserInterface.py" line="5417"/> <source>Starting process '{0} {1}'. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5426"/> + <location filename="../UI/UserInterface.py" line="5433"/> <source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5502"/> + <location filename="../UI/UserInterface.py" line="5509"/> <source>Process '{0}' has exited. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5901"/> + <location filename="../UI/UserInterface.py" line="5908"/> <source>Documentation Missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5901"/> + <location filename="../UI/UserInterface.py" line="5908"/> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5884"/> + <location filename="../UI/UserInterface.py" line="5891"/> <source>Documentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5709"/> + <location filename="../UI/UserInterface.py" line="5716"/> <source><p>The PyQt4 documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6337"/> + <location filename="../UI/UserInterface.py" line="6344"/> <source>Keyboard shortcut file (*.e4k)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6506"/> + <location filename="../UI/UserInterface.py" line="6513"/> <source>Save tasks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6506"/> + <location filename="../UI/UserInterface.py" line="6513"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6535"/> + <location filename="../UI/UserInterface.py" line="6542"/> <source>Read tasks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6535"/> + <location filename="../UI/UserInterface.py" line="6542"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6631"/> + <location filename="../UI/UserInterface.py" line="6638"/> <source>Save session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6569"/> + <location filename="../UI/UserInterface.py" line="6576"/> <source><p>The session file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6615"/> + <location filename="../UI/UserInterface.py" line="6622"/> <source>Read session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6615"/> + <location filename="../UI/UserInterface.py" line="6622"/> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6902"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6902"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7080"/> + <location filename="../UI/UserInterface.py" line="7087"/> <source>&Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7089"/> + <location filename="../UI/UserInterface.py" line="7096"/> <source>Trying host {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7245"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Update available</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7264"/> + <location filename="../UI/UserInterface.py" line="7271"/> <source>Error during updates check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7264"/> + <location filename="../UI/UserInterface.py" line="7271"/> <source>Could not perform updates check.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7288"/> + <location filename="../UI/UserInterface.py" line="7295"/> <source><h3>Available versions</h3><table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7339"/> + <location filename="../UI/UserInterface.py" line="7346"/> <source>First time usage</source> <translation type="unfinished"></translation> </message> @@ -78947,27 +78962,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7153"/> + <location filename="../UI/UserInterface.py" line="7160"/> <source>Error getting versions information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7146"/> - <source>The versions information could not be downloaded. Please go online and try again.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="6103"/> - <source>Open Browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="6103"/> - <source>Could not start a web browser</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7153"/> + <source>The versions information could not be downloaded. Please go online and try again.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="6110"/> + <source>Open Browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="6110"/> + <source>Could not start a web browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7160"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -79053,12 +79068,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5339"/> + <location filename="../UI/UserInterface.py" line="5346"/> <source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7358"/> + <location filename="../UI/UserInterface.py" line="7365"/> <source>Select Workspace Directory</source> <translation type="unfinished"></translation> </message> @@ -79423,7 +79438,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5771"/> + <location filename="../UI/UserInterface.py" line="5778"/> <source><p>The PyQt5 documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> @@ -79433,7 +79448,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7080"/> + <location filename="../UI/UserInterface.py" line="7087"/> <source>%v/%m</source> <translation type="unfinished"></translation> </message> @@ -79453,7 +79468,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7084"/> + <location filename="../UI/UserInterface.py" line="7091"/> <source>Version Check</source> <translation type="unfinished"></translation> </message> @@ -79523,27 +79538,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5058"/> + <location filename="../UI/UserInterface.py" line="5065"/> <source>Qt v.3 is not supported by eric6.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7245"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7257"/> + <location filename="../UI/UserInterface.py" line="7264"/> <source>Eric6 is up to date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7257"/> + <location filename="../UI/UserInterface.py" line="7264"/> <source>You are using the latest version of eric6</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7339"/> + <location filename="../UI/UserInterface.py" line="7346"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished"></translation> </message> @@ -79553,17 +79568,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4065"/> + <location filename="../UI/UserInterface.py" line="4072"/> <source>&User Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4137"/> + <location filename="../UI/UserInterface.py" line="4144"/> <source>No User Tools Configured</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7100"/> + <location filename="../UI/UserInterface.py" line="7107"/> <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -79608,7 +79623,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6653"/> + <location filename="../UI/UserInterface.py" line="6660"/> <source>Load session</source> <translation type="unfinished"></translation> </message> @@ -79623,17 +79638,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6653"/> + <location filename="../UI/UserInterface.py" line="6660"/> <source>eric6 Session Files (*.e5s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6700"/> + <location filename="../UI/UserInterface.py" line="6707"/> <source>Crash Session found!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6700"/> + <location filename="../UI/UserInterface.py" line="6707"/> <source>A session file of a crashed session was found. Shall this session be restored?</source> <translation type="unfinished"></translation> </message> @@ -79648,17 +79663,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7233"/> + <location filename="../UI/UserInterface.py" line="7240"/> <source>Update Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7233"/> + <location filename="../UI/UserInterface.py" line="7240"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7223"/> + <location filename="../UI/UserInterface.py" line="7230"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation type="unfinished"></translation> </message> @@ -79713,7 +79728,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5884"/> + <location filename="../UI/UserInterface.py" line="5891"/> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> @@ -79748,22 +79763,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3128"/> + <location filename="../UI/UserInterface.py" line="3135"/> <source>Left Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3144"/> + <location filename="../UI/UserInterface.py" line="3151"/> <source>Bottom Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3155"/> + <location filename="../UI/UserInterface.py" line="3162"/> <source>Right Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3179"/> + <location filename="../UI/UserInterface.py" line="3186"/> <source>Plug-ins</source> <translation type="unfinished"></translation> </message> @@ -79789,17 +79804,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6058"/> + <location filename="../UI/UserInterface.py" line="6065"/> <source>Start Web Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6000"/> + <location filename="../UI/UserInterface.py" line="6007"/> <source>The eric6 web browser could not be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6058"/> + <location filename="../UI/UserInterface.py" line="6065"/> <source><p>The eric6 web browser is not started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -79814,7 +79829,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3493"/> + <location filename="../UI/UserInterface.py" line="3500"/> <source><p>This part of the status bar allows zooming the current editor or shell.</p></source> <translation type="unfinished"></translation> </message> @@ -79888,6 +79903,11 @@ <source><b>MicroPython</b><p>This switches the input focus to the MicroPython window.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../UI/UserInterface.py" line="3128"/> + <source>Central Park</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name> @@ -89758,46 +89778,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1427"/> <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="2056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <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="2066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <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="1436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1447"/> <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="2048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/> <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="2051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <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="2075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <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> @@ -89805,12 +89825,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1481"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -89821,13 +89841,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/eric6/i18n/eric6_es.ts Fri Aug 23 13:23:22 2019 +0200 +++ b/eric6/i18n/eric6_es.ts Fri Aug 23 13:23:36 2019 +0200 @@ -6898,7 +6898,7 @@ <message> <location filename="../Debugger/DebugUI.py" line="597"/> <source>&Start</source> - <translation>&Iniciar</translation> + <translation type="obsolete">&Iniciar</translation> </message> <message> <location filename="../Debugger/DebugUI.py" line="599"/> @@ -7144,6 +7144,11 @@ <source>No locals available.</source> <translation>No hay locals disponibles.</translation> </message> + <message> + <location filename="../Debugger/DebugUI.py" line="597"/> + <source>Sta&rt</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DebugViewer</name> @@ -31278,7 +31283,7 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> <source>The hg process did not finish within 30s.</source> <translation>El proceso hg no terminó en un plazo de 30s.</translation> </message> @@ -31308,420 +31313,425 @@ <translation>Clonando proyecto desde un repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="630"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizando con el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="691"/> <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="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="760"/> <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="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/> <source>Renaming {0}</source> <translation>Renombrando {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1061"/> <source>Merging</source> <translation>Haciendo un merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936"/> <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="1983"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <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="999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1361"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/> <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="2341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> <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="2366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2377"/> <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="2390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2401"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2414"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2656"/> <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="2223"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2687"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2608"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <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="2737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/> <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="2533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2544"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2647"/> <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="2791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2802"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2782"/> <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="2550"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <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="2818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2829"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2822"/> <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="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="555"/> <source>Committing changes to Mercurial repository</source> <translation>Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3426"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido reiniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido iniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2897"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2938"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2949"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2996"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3052"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3101"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/> <source>Add Sub-repository</source> <translation>Añadir Sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3292"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>No se ha podido leer el archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>El archivo .hgsub de sub-repositorios ya contiene una entrada.</p><p>Abortando...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>No se ha podido escribir al archivo .hgsub de sub-repositorios.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> <source>Remove Sub-repositories</source> <translation>Eliminar Sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3280"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>El archivo de subrepositorios .hgsub no existe. Abortando...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> <source>Commit Changes</source> <translation>Hacer Commit de Cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation>La operación de commit afecta a archivos que tienen cambios sin guardar. ¿Continuar con la operación de commit?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="984"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="995"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation>¿Realmente desea revertir todos los cambios a estos archivos o directorios?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> <source>Do you really want to revert all changes of the project?</source> <translation>¿Realmente desea revertir todos los cambios del proyecto?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3156"/> <source>Create Unversioned Archive</source> <translation>Crear Archivo Sin Versionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> <source>Mercurial Side-by-Side Difference</source> <translation>Diferencia Lado a Lado Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo <b>{0}</b> no se ha podido leer.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1787"/> <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/hg.py" line="943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="954"/> <source>Tagging in the Mercurial repository</source> <translation>Haciendo tag en el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Created new branch <{0}>.</source> <translation>Creada nueva branch <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> <source>Current branch tip</source> <translation>Tip branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3689"/> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/> <source>Delete Bookmark</source> <translation>Borrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/> <source>Select the bookmark to be deleted:</source> <translation>Seleccionar el marcador a borrar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> <source>Delete Mercurial Bookmark</source> <translation>Borrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3755"/> <source>Rename Mercurial Bookmark</source> <translation>Renombrar Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3797"/> <source>Move Mercurial Bookmark</source> <translation>Mover Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/> <source>Pull Bookmark</source> <translation>Pull de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/> <source>Select the bookmark to be pulled:</source> <translation>Seleccinar el marcador sobre el que hacer pull:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3903"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Haciendo pull de marcador desde un repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/> <source>Push Bookmark</source> <translation>Push de Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/> <source>Select the bookmark to be push:</source> <translation>Seleccinar el marcador sobre el que hacer push:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3947"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Haciendo push de marcador desde un repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/> <source>Re-Merge</source> <translation>Re-Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1098"/> <source>Do you really want to re-merge these files or directories?</source> <translation>¿Desea realmente hacer un re-merge de estos archivos o directorios?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/> <source>Do you really want to re-merge the project?</source> <translation>¿Desea realmente hacer un re-merge del proyecto?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/> <source>Re-Merging</source> <translation>Aplicando Re-Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <source>Marking as 'unresolved'</source> <translation>Marcando como 'unresolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> <source>Marking as 'resolved'</source> <translation>Marcando como 'resolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/> <source>Delete All Backups</source> <translation>Borrar todas las Copias de Seguridad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation><p>¿Desea realmente borrar todos los bundles de copia de seguridad almacenados en el área de copias de seguridad <b>{0}</b>?</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/> <source>Canceling uncommitted merge</source> - <translation>Cancelando merge sin commit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3102"/> + <translation type="obsolete">Cancelando merge sin commit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3113"/> <source>Copy Changesets (Stop)</source> <translation>Copiar Changesets (Stop)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3126"/> <source>Copy Changesets (Abort)</source> <translation>Copiar Changesets (Abortar)</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <source>Aborting uncommitted merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -35485,432 +35495,432 @@ <translation><b>Revertir cambios</b><p>Revierte todos los cambios hechos al proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>Tag in repository</source> <translation>Crear un Tag en el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>&Tag in repository...</source> <translation>Crear un &Tag en el repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> - <source>Tag the local project in the repository</source> - <translation>Crea un tag del proyecto local en el repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Crear un Tag en el repositorio</b><p>Crea un tag del proyecto local en el repositorio.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> - <source>List tags</source> - <translation>Listar tags</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> - <source>List tags...</source> - <translation>Listar tags...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> - <source>List tags of the project</source> - <translation>Lista los tags del proyecto</translation> + <source>Tag the local project in the repository</source> + <translation>Crea un tag del proyecto local en el repositorio</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>Listar tags</b><p>Lista los tags del proyecto.</p></translation> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Crear un Tag en el repositorio</b><p>Crea un tag del proyecto local en el repositorio.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>List branches</source> - <translation>Listar branches</translation> + <source>List tags</source> + <translation>Listar tags</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>List branches...</source> - <translation>Listar branches...</translation> + <source>List tags...</source> + <translation>Listar tags...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/> - <source>List branches of the project</source> - <translation>Lista las branches del proyecto</translation> + <source>List tags of the project</source> + <translation>Lista los tags del proyecto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Listar branches</b><p>Lista las branches del proyecto.</p></translation> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Listar tags</b><p>Lista los tags del proyecto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> - <source>Create branch</source> - <translation>Crear branch</translation> + <source>List branches</source> + <translation>Listar branches</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <source>List branches...</source> + <translation>Listar branches...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> + <source>List branches of the project</source> + <translation>Lista las branches del proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Listar branches</b><p>Lista las branches del proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> + <source>Create branch</source> + <translation>Crear branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Create &branch...</source> <translation>Crear &branch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/> <source>Create a new branch for the local project in the repository</source> <translation>Crear una nueva branch para el proyecto local en el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Crear branch</b><p>Crea una nueva branch para el proyecto local en el repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> <source>Close branch</source> <translation>Cerrar branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> <source>Close the current branch of the local project</source> <translation>Cerrar la branch actual para el proyecto local</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Cerrar branch</b><p>Cierra la branch actual del proyecto local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source>Switch</source> <translation>Hacer switch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source>S&witch...</source> <translation>Hacer s&witch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source>Switch the working directory to another revision</source> <translation>Hacer switch del directorio de trabajo a otra revisión</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Hacer switch</b><p>Hace un switch del directorio de trabajo a otra revisión.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> - <source>Cleanup</source> - <translation>Limpiar (cleanup)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> - <source>Cleanu&p</source> - <translation>Lim&piar (cleanup)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source>Cleanup the local project</source> - <translation>Limpiar (cleanup) el proyecto local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Limpieza (cleanup)</b><p>Lleva a cabo un cleanup del proyecto local.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source>Execute command</source> - <translation>Ejecutar comando</translation> + <source>Cleanup</source> + <translation>Limpiar (cleanup)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source>E&xecute command...</source> - <translation>E&jecutar comando...</translation> + <source>Cleanu&p</source> + <translation>Lim&piar (cleanup)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> - <source>Execute an arbitrary Mercurial command</source> - <translation>Ejecuta un comando Mercurial arbitrario</translation> + <source>Cleanup the local project</source> + <translation>Limpiar (cleanup) el proyecto local</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Limpieza (cleanup)</b><p>Lleva a cabo un cleanup del proyecto local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source>Execute command</source> + <translation>Ejecutar comando</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source>E&xecute command...</source> + <translation>E&jecutar comando...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> + <source>Execute an arbitrary Mercurial command</source> + <translation>Ejecuta un comando Mercurial arbitrario</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando Mercurial arbitrario.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source>Configure</source> <translation>Configurar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source>Configure...</source> <translation>Configurar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Mostrar el diálogo de configuración con la página de Mercurial seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Configurar</b><p>Mostrar el diálogo de configuración con la página de Mercurial seleccionada.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> - <source>Show paths</source> - <translation>Mostrar rutas</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> - <source>Show paths...</source> - <translation>Mostrar rutas...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> - <source>Show the aliases for remote repositories</source> - <translation>Mostrar los alias para los repositorios remotos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation><b>Mostrar rutas</b><p>Muestra los alias para los repositorios remotos.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> - <source>Verify repository</source> - <translation>Verificar repositorio</translation> + <source>Show paths</source> + <translation>Mostrar rutas</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> - <source>Verify repository...</source> - <translation>Verificar repositorio...</translation> + <source>Show paths...</source> + <translation>Mostrar rutas...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> - <source>Verify the integrity of the repository</source> - <translation>Verificar la integridad del repositorio</translation> + <source>Show the aliases for remote repositories</source> + <translation>Mostrar los alias para los repositorios remotos</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> - <translation><b>Verificar repositorio</b><p>Verifica la integridad del repositorio.</p></translation> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation><b>Mostrar rutas</b><p>Muestra los alias para los repositorios remotos.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Recover</source> - <translation>Recuperar</translation> + <source>Verify repository</source> + <translation>Verificar repositorio</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Recover...</source> - <translation>Recuperar...</translation> + <source>Verify repository...</source> + <translation>Verificar repositorio...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> - <source>Recover from an interrupted transaction</source> - <translation>Recuperar de una transacción interrumpida</translation> + <source>Verify the integrity of the repository</source> + <translation>Verificar la integridad del repositorio</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation><b>Verificar repositorio</b><p>Verifica la integridad del repositorio.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <source>Recover</source> + <translation>Recuperar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <source>Recover...</source> + <translation>Recuperar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <source>Recover from an interrupted transaction</source> + <translation>Recuperar de una transacción interrumpida</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Recuperar</b><p>Recupera de una transacción interrumpida.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> - <source>Create .hgignore</source> - <translation>Crear .hgignore</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> - <source>Create a .hgignore file with default values</source> - <translation>Crear un archivo .hgignore con valores por defecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation><b>Crear .hgignore</b><p>Crea un archivo .hgignore con valores por defecto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> - <source>Create changegroup</source> - <translation>Crear changegroup</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <source>Create .hgignore</source> + <translation>Crear .hgignore</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> + <source>Create a .hgignore file with default values</source> + <translation>Crear un archivo .hgignore con valores por defecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation><b>Crear .hgignore</b><p>Crea un archivo .hgignore con valores por defecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/> + <source>Create changegroup</source> + <translation>Crear changegroup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/> <source>Create changegroup...</source> <translation>Crear changegroup...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source>Create changegroup file collecting changesets</source> <translation>Crea un archivo de changegroup recogiendo changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1863"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824"/> <source>Apply changegroups...</source> <translation>Aplicar changegroups...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source>Apply one or several changegroup files</source> <translation>Aplicar uno o varios archivos de changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1362"/> <source>Changegroup Management</source> <translation>Gestión de Chagegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Crear changegroup</b><p>Crea un archivo de changegroup recogiendo los changeset seleccionados (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Aplicar changegroups</b><p>Aplica uno o varios archivos de changegroup generados por la acción 'Crear changegroup' (hg unbundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <source>Show current branch</source> <translation>Mostrar la branch actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source>Show the current branch of the project</source> <translation>Mostrar la branch actual del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Mostrar branch actual</b><p>Muestra la branch actual del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Mark as "good"</source> - <translation>Marcar como "bueno"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="830"/> - <source>Mark a selectable changeset as good</source> - <translation>Marcar un changeset seleccionable como bueno</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation><b>Marcar como bueno</b><p>Marca un changeset seleccionable como bueno.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> - <source>Mark as "bad"</source> - <translation>Marcar como "malo"</translation> + <source>Mark as "good"</source> + <translation>Marcar como "bueno"</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> - <source>Mark a selectable changeset as bad</source> - <translation>Marcar un changeset seleccionable como malo</translation> + <source>Mark a selectable changeset as good</source> + <translation>Marcar un changeset seleccionable como bueno</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> - <translation><b>Marcar como malo</b><p>Marca un changeset seleccionable como malo.</p></translation> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation><b>Marcar como bueno</b><p>Marca un changeset seleccionable como bueno.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> - <source>Skip</source> - <translation>Saltar</translation> + <source>Mark as "bad"</source> + <translation>Marcar como "malo"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> + <source>Mark a selectable changeset as bad</source> + <translation>Marcar un changeset seleccionable como malo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation><b>Marcar como malo</b><p>Marca un changeset seleccionable como malo.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <source>Skip</source> + <translation>Saltar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> <source>Reset</source> <translation>Reiniciar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> <source>Reset the bisect search data</source> <translation>Reiniciar los datos de búsqueda de bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Reiniciar</b><p>Reinicia los datos de búsqueda de bisect.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1375"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Mark as "good"...</source> - <translation>Marcar como "bueno"...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> + <source>Mark as "good"...</source> + <translation>Marcar como "bueno"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> <source>Mark as "bad"...</source> <translation>Marcar como "malo"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Preview changegroup...</source> <translation>Previsualizar changegroup...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source>Identify</source> <translation>Identificar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source>Identify...</source> <translation>Identificar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source>Identify the project directory</source> <translation>Identificar el directorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identificar</b><p>Identifica el directorio de proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Previsualizar un archivo de changegroup conteniendo una colección de changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Previsualizar changegroup</b><p>Previsualiza un archivo de changegroup conteniendo una colección de changesets.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source>Back out changeset</source> <translation>Hacer respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Back out changes of an earlier changeset</source> <translation>Hacer respaldo de cambios de un changeset anterior</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Hacer respaldo de changeset</b><p>Hace un respaldo de cambios de un changeset anterior.</p></translation> </message> @@ -35930,312 +35940,312 @@ <translation><b>Hacer push de cambios (force)</b><p>Se hace un push de los cambios desde el repositorio local a un repositorio remoto utilizando la opción 'force'.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/> <source>Specials</source> <translation>Especial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source>Serve project repository</source> <translation>Servir repositorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> - <source>Serve project repository...</source> - <translation>Servir repositorio de proyecto...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> - <source>Serve the project repository</source> - <translation>Servir el repositorio de proyecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> - <source><b>Serve project repository</b><p>This serves the project repository.</p></source> - <translation><b>Servir repositorio de proyecto</b><p>Esto sirve el repositorio de proyecto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656"/> - <source>Pull</source> - <translation>Hacer Pull</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/> - <source>The project should be reread. Do this now?</source> - <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> - <source>Push new branch</source> - <translation>Hacer push de nueva rama</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> - <source>Push the current branch of the local project as a new named branch</source> - <translation>Ejecutar push de la rama actual del proyecto local como una nueva rama con nombre</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> - <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> - <translation><b>Hacer push de nueva rama</b><p>Hace un push de la rama actual del proyecto local como una nueva rama con nombre.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> - <source>Rollback last transaction</source> - <translation>Rollback de última transacción</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> - <source>Rollback the last transaction</source> - <translation>Rollback de la última transacción</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> - <source>Extensions</source> - <translation>Extensiones</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> - <source>Edit user configuration</source> - <translation>Editar configuración de usuario</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> - <source>Edit user configuration...</source> - <translation>Editar configuración de usuario...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Show an editor to edit the user configuration file</source> - <translation>Mostrar un editor para editar el archivo de configuración de usuario</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation><b>Editar configuración de usuario</b><p>Mostrar un editor para editar el archivo de configuración de usuario.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> - <source>Edit repository configuration</source> - <translation>Editar configuración del repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> - <source>Edit repository configuration...</source> - <translation>Editar configuración del repositorio...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> - <source>Show an editor to edit the repository configuration file</source> - <translation>Mostrar un editor para editar el archivo de configuración del repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation><b>Editar configuración del repositorio</b><p>Mostrar un editor para editar el archivo de configuración del repositorio.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> - <source>Show combined configuration settings</source> - <translation>Mostrar ajustes de configuración combinados</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> - <source>Show combined configuration settings...</source> - <translation>Mostrar ajustes de configuración combinados...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> - <source>Show the combined configuration settings from all configuration files</source> - <translation>Mostrar los ajustes de configuración combinados de todos los archivos de configuración</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> - <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> - <translation><b>Mostrar ajustes de configuración combinados</b><p>Muestra los ajustes de configuración combinados de todos los archivos de configuración.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> - <source>Skip...</source> - <translation>Ignorar...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> - <source>Skip a selectable changeset</source> - <translation>Ignorar un changeset seleccionable</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> - <source><b>Skip</b><p>This skips a selectable changeset.</p></source> - <translation><b>Ignorar</b><p>Ignora un changeset seleccionable.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1895"/> - <source>Import Patch</source> - <translation>Importar Patch</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <source>Serve project repository...</source> + <translation>Servir repositorio de proyecto...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> + <source>Serve the project repository</source> + <translation>Servir el repositorio de proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> + <source><b>Serve project repository</b><p>This serves the project repository.</p></source> + <translation><b>Servir repositorio de proyecto</b><p>Esto sirve el repositorio de proyecto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1674"/> + <source>Pull</source> + <translation>Hacer Pull</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/> + <source>The project should be reread. Do this now?</source> + <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Push new branch</source> + <translation>Hacer push de nueva rama</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/> + <source>Push the current branch of the local project as a new named branch</source> + <translation>Ejecutar push de la rama actual del proyecto local como una nueva rama con nombre</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> + <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> + <translation><b>Hacer push de nueva rama</b><p>Hace un push de la rama actual del proyecto local como una nueva rama con nombre.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> + <source>Rollback last transaction</source> + <translation>Rollback de última transacción</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> + <source>Rollback the last transaction</source> + <translation>Rollback de la última transacción</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1420"/> + <source>Extensions</source> + <translation>Extensiones</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <source>Edit user configuration</source> + <translation>Editar configuración de usuario</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <source>Edit user configuration...</source> + <translation>Editar configuración de usuario...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <source>Show an editor to edit the user configuration file</source> + <translation>Mostrar un editor para editar el archivo de configuración de usuario</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation><b>Editar configuración de usuario</b><p>Mostrar un editor para editar el archivo de configuración de usuario.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> + <source>Edit repository configuration</source> + <translation>Editar configuración del repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> + <source>Edit repository configuration...</source> + <translation>Editar configuración del repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <source>Show an editor to edit the repository configuration file</source> + <translation>Mostrar un editor para editar el archivo de configuración del repositorio</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation><b>Editar configuración del repositorio</b><p>Mostrar un editor para editar el archivo de configuración del repositorio.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/> + <source>Show combined configuration settings</source> + <translation>Mostrar ajustes de configuración combinados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/> + <source>Show combined configuration settings...</source> + <translation>Mostrar ajustes de configuración combinados...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Show the combined configuration settings from all configuration files</source> + <translation>Mostrar los ajustes de configuración combinados de todos los archivos de configuración</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <translation><b>Mostrar ajustes de configuración combinados</b><p>Muestra los ajustes de configuración combinados de todos los archivos de configuración.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <source>Skip...</source> + <translation>Ignorar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <source>Skip a selectable changeset</source> + <translation>Ignorar un changeset seleccionable</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <source><b>Skip</b><p>This skips a selectable changeset.</p></source> + <translation><b>Ignorar</b><p>Ignora un changeset seleccionable.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1919"/> + <source>Import Patch</source> + <translation>Importar Patch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951"/> <source>Import Patch...</source> <translation>Importar Patch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> <source>Import a patch from a patch file</source> <translation>Importar un patch desde un archivo de patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation><b>Importar Patch</b><p>Importa un patch desde un archivo de patch al proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369"/> <source>Patch Management</source> <translation>Gestión de Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1939"/> <source>Revert Changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> <source>Export Patches...</source> <translation>Exportar Patches...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> - <source>Export revisions to patch files</source> - <translation>Exportar revisiones a archivos de patch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="961"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation><b>Exportar Patches</b><p>Exporta revisiones del proyecto a archivos de patch.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source>Change Phase</source> - <translation>Cambiar Fase</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source>Change Phase...</source> - <translation>Cambiar Fase...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> - <source>Change the phase of revisions</source> - <translation>Cambiar la fase de revisiones</translation> + <source>Export revisions to patch files</source> + <translation>Exportar revisiones a archivos de patch</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation><b>Exportar Patches</b><p>Exporta revisiones del proyecto a archivos de patch.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <source>Change Phase</source> + <translation>Cambiar Fase</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <source>Change Phase...</source> + <translation>Cambiar Fase...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <source>Change the phase of revisions</source> + <translation>Cambiar la fase de revisiones</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="989"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation><b>Cambiar Fase</b><p>Cambia la fase de revisiones.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1959"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source>Copies changesets from another branch</source> <translation>Copiar changesets de otra branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation><b>Copiar Changesets</b><p>Copia changesets de otra branch encima del directorio de trabajo actual con el usuario, fecha y descripción del changeset original.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> <source>Continue Copying Session</source> <translation>Continuar Sesión de Copia</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> <source>Continue the last copying session after conflicts were resolved</source> <translation>Continuar la última sesión de copia despues de resolver los conflictos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1020"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation><b>Continuar Sesión de Copia</b><p>Continua la última sesión de copia despues de resolver los conflictos.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1974"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> <source>Conflicts resolved</source> <translation>Conflictos resueltos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> <source>Con&flicts resolved</source> <translation>Con&flictos resueltos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source>Mark all conflicts of the local project as resolved</source> <translation>Marcar todos los conflictos del proyecto local como resueltos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation><b>Conflictos resueltos</b><p>Marca todos los conflictos del proyecto local como resueltos.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Add</source> <translation>Añadir</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Add...</source> <translation>Añadir...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> <source>Add a sub-repository</source> <translation>Añadir un sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation><b>Añadir...</b><p>Añadir un sub-repositorio al proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Remove...</source> <translation>Eliminar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source>Remove sub-repositories</source> <translation>Eliminar sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1080"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation><b>Eliminar...</b><p>Eliminar sub-repositorios del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1424"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440"/> <source>Sub-Repository</source> <translation>Sub-repositorio</translation> </message> @@ -36265,32 +36275,32 @@ <translation><b>Mostrar sumario</b><p>Muestra información sumarial del estado del directorio de trabajo.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Create unversioned archive</source> <translation>Crear archivo sin versionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Create unversioned archive...</source> <translation>Crear archivo sin versionar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> <source>Create an unversioned archive from the repository</source> <translation>Crear un archivo sin versionar a partir del repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation><b>Crear archivo sin versionar...</b><p>Crea un archivo sin versionar a partir del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="917"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation><b>Rollback de última transacción</b><p>Lleva a cabo un rollback de la última transacción. Las transactiones se utilizan para encapsular los efectos de todos los comandos que crean nuevos changesets or propagan changesets existentes hacia un repository. Por ejemplo, los siguientes comandos son transaccionales, y sus efectos pueden ser revertidos (rollback):<ul><li>commit</li><li>import</li><li>pull</li><li>push (con este repositorio como destino)</li><li>unbundle</li></ul></p><p><strong>Este comando es peligroso. Utiliícelo por favor con cuidado.</strong></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1328"/> <source>Administration</source> <translation>Administración</translation> </message> @@ -36317,338 +36327,368 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> <source>Cancel uncommitted merge</source> - <translation>Cancelar merge sin commit</translation> + <translation type="obsolete">Cancelar merge sin commit</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> <source>Cancel an uncommitted merge and lose all changes</source> - <translation>Cancelar un merge sin commit y perder todos los cambios</translation> + <translation type="obsolete">Cancelar un merge sin commit y perder todos los cambios</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> - <translation><b>Cancelar merge sin commit</b><p>Esto cancela un merge sin commit causando que todos los cambios se pierdan.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> + <translation type="obsolete"><b>Cancelar merge sin commit</b><p>Esto cancela un merge sin commit causando que todos los cambios se pierdan.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> <source>List bookmarks</source> <translation>Listar marcadores</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> <source>List bookmarks...</source> <translation>Listar marcadores...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/> <source>List bookmarks of the project</source> <translation>Lista marcadores del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1112"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation><b>Listar marcadores</b><p>Lista los marcadores del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> <source>Define bookmark</source> <translation>Definir marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> <source>Define bookmark...</source> <translation>Definir marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/> <source>Define a bookmark for the project</source> <translation>Define un marcador para el proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1127"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation><b>Definir marcador</b><p>Define un marcador para el proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Delete bookmark</source> <translation>Borrar marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Delete bookmark...</source> <translation>Borrar marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/> <source>Delete a bookmark of the project</source> <translation>Borrar un marcador del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation><b>Borrar marcador</b><p>Borra un marcador del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Rename bookmark</source> <translation>Renombrar marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Rename bookmark...</source> <translation>Renombrar marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source>Rename a bookmark of the project</source> <translation>Renombrar un marcador del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1157"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation><b>Renombrar marcador</b><p>Renombra un marcador del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> <source>Move bookmark</source> <translation>Mover marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> <source>Move bookmark...</source> <translation>Mover marcador...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source>Move a bookmark of the project</source> <translation>Mover un marcador del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1172"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation><b>Mover marcador</b><p>Mueve un marcador del proyecto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1180"/> <source>Show incoming bookmarks</source> <translation>Mostrar marcadores entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source>Show a list of incoming bookmarks</source> <translation>Muestra una lista de marcadores entrantes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1174"/> - <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> - <translation><b>Mostrar marcadores entrantes</b><p>Muestra una lista de nuevos marcadores disponibles en el repositorio remoto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> - <source>Pull bookmark</source> - <translation>Pull de marcador</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1188"/> + <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> + <translation><b>Mostrar marcadores entrantes</b><p>Muestra una lista de nuevos marcadores disponibles en el repositorio remoto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> + <source>Pull bookmark</source> + <translation>Pull de marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> <source>Pull a bookmark from a remote repository</source> <translation>Hacer pull de marcador desde un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1205"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Hacer pull de marcador</b><p>Hace pull de un marcador desde un repositorio remoto al repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1229"/> <source>Show outgoing bookmarks</source> <translation>Mostrar marcadores salientes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source>Show a list of outgoing bookmarks</source> <translation>Muestra una lista de marcadores salientes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223"/> - <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> - <translation><b>Mostrar marcadores salientes</b><p>Muestra una lista de nuevos marcadores disponibles en el repositorio local.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1232"/> - <source>Push bookmark</source> - <translation>Push de marcador</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1237"/> + <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> + <translation><b>Mostrar marcadores salientes</b><p>Muestra una lista de nuevos marcadores disponibles en el repositorio local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1246"/> + <source>Push bookmark</source> + <translation>Push de marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> <source>Push a bookmark to a remote repository</source> <translation>Hacer push de marcador a un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1254"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Hacer push de marcador</b><p>Hace push de un marcador desde un repositorio local al repositorio remoto.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399"/> + <source>Bookmarks</source> + <translation>Marcadores</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1383"/> - <source>Bookmarks</source> - <translation>Marcadores</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390"/> <source>Branches</source> <translation>Branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> <source>Re-Merge</source> <translation>Re-Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation>Aplicar Re-Merge a todos los archivos con conflictos sin resolver en el proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> <source>Show conflicts</source> <translation>Mostrar conflictos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> <source>Show conflicts...</source> <translation>Mostrar conflictos...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source>Show a dialog listing all files with conflicts</source> <translation>Mostrar un diálogo listando todos los archivos con conflictos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation><b>Lista de Conflictos</b>\n<p>Muestra un listado de archivos que han tenido o tienen todavía conflictos.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> <source>Conflicts unresolved</source> <translation>Conflictos sin resolver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> <source>Mark all conflicts of the local project as unresolved</source> <translation>Marcar todos los conflictos del proyecto local como sin resolver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation><b>Conflictos sin resolver</b><p>Marca todos los conflictos del proyecto local como sin resolver.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="445"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="459"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation><b>Re-Merge</b><p>Aplica un re-merge a todos los archivos con conflictos sin resolver del proyecto, descartando cualquier intento anterior de merge.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1528"/> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> <source>Pull current bookmark</source> <translation>Pull del marcador actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source>Pull the current bookmark from a remote repository</source> <translation>Hacer pull del marcador actual desde repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1221"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation><b>Pull de marcador actual<p>Ejecuta un pull del marcador actual desde un repositorio remoto al repositorio local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1262"/> <source>Push current bookmark</source> <translation>Push de marcador actual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1267"/> <source>Push the current bookmark to a remote repository</source> <translation>Hacer push del marcador actual hacia repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> - <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> - <translation><b>Push de marcador actual<p>Ejecuta un pshl del marcador actual desde 3l repositorio local hacia un repositorio remoto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> - <source>Delete all backups</source> - <translation>Borrar todas las Copias de Seguridad</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> + <translation><b>Push de marcador actual<p>Ejecuta un pshl del marcador actual desde 3l repositorio local hacia un repositorio remoto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1279"/> + <source>Delete all backups</source> + <translation>Borrar todas las Copias de Seguridad</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1284"/> <source>Delete all backup bundles stored in the backup area</source> <translation>Borrar todos los bundles de copia de seguridad almacenados en el área de copias de seguridad</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1287"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation><b>Borrar todas las copias de seguridad</b><p>Borra todos los bundles de copia de seguridad almacenados en el área de copias de seguridad del repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> - <source>Stop Copying Session</source> - <translation>Detener la Sesión de Copia</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1018"/> - <source>Stop the interrupted copying session</source> - <translation>Detener la sesión de copia interrumpida</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/> - <source>Abort Copying Session</source> - <translation>Abortar Sesión de Copia</translation> + <source>Stop Copying Session</source> + <translation>Detener la Sesión de Copia</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> + <source>Stop the interrupted copying session</source> + <translation>Detener la sesión de copia interrumpida</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <source>Abort Copying Session</source> + <translation>Abortar Sesión de Copia</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> <source>Abort the interrupted copying session and rollback</source> <translation>Abortar la sesión interrumpida de copia y hacer rollback</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> + <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> + <translation><b>Abortar Sesión de Copia</b><p>Aborta la sesión de copia interrumpida y hace un rollback al estado anterior de la copia.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1445"/> + <source>Merge Changesets</source> + <translation>Hacer Merge de Changesets</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1988"/> + <source>Copy Changesets (Stop)</source> + <translation>Copiar Changesets (Stop)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/> + <source>Copy Changesets (Abort)</source> + <translation>Copiar Changesets (Abortar)</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> - <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> - <translation><b>Abortar Sesión de Copia</b><p>Aborta la sesión de copia interrumpida y hace un rollback al estado anterior de la copia.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1429"/> - <source>Merge Changesets</source> - <translation>Hacer Merge de Changesets</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1964"/> - <source>Copy Changesets (Stop)</source> - <translation>Copiar Changesets (Stop)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/> - <source>Copy Changesets (Abort)</source> - <translation>Copiar Changesets (Abortar)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation><b>Detener Sesión de Copia</b><p>Detiene la sesión de copia interrumpida.</p></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> + <source>Commit Merge</source> + <translation type="unfinished">Commit Merge</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> + <source>Commit a merge.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <source>Abort Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> + <source>Abort an uncommitted merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443"/> + <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -47727,202 +47767,202 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="853"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="854"/> <source>Serial Device Connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="853"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="854"/> <source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="898"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="899"/> <source>Run Script</source> <translation type="unfinished">Ejecutar Script</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="881"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="882"/> <source>There is no editor open. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="889"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="890"/> <source>The current editor does not contain a script. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="898"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="899"/> <source><p>Cannot run script.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="922"/> <source>Open Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="922"/> <source>Python3 Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="965"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="966"/> <source>Start Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="965"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="966"/> <source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="995"/> <source>Unsaved Chart Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="995"/> <source>The chart contains unsaved data.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/> <source>Start File Manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/> <source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1097"/> <source>Show Version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1100"/> <source>Show Implementation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> <source>Synchronize Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1108"/> <source>Show Device Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1111"/> <source>Show Local Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1339"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1361"/> <source>Compile Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1359"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1381"/> <source>Compile Current Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1132"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1135"/> <source><h3>Device Version Information</h3></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1141"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1144"/> <source>No version information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1143"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1146"/> <source>Device Version Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1166"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1169"/> <source>unknown</source> <translation type="unfinished">desconocido</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/> <source>Device Implementation Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/> <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> <source><p>The time of the connected device was synchronized with the local time.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1216"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1219"/> <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1224"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1227"/> <source><h3>Device Date and Time</h3><p>{0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1238"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1241"/> <source>Device Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/> <source>Local Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/> <source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/> <source>Error handling device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/> <source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1291"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1313"/> <source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1309"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1331"/> <source>Python Files (*.py);;All Files (*)</source> <translation type="unfinished">Archivos Python (*.py);;Todos los Archivos (*)</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1319"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1341"/> <source>The Python file <b>{0}</b> does not exist. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1329"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1351"/> <source>'mpy-cross' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1352"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> <source>The current editor does not contain a Python file. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -47937,12 +47977,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="978"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="979"/> <source>µPy Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1059"/> <source>µPy Files</source> <translation type="unfinished"></translation> </message> @@ -78404,7 +78444,7 @@ <translation>Mostrar las versiones disponibles para descarga</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3724"/> + <location filename="../UI/UserInterface.py" line="3731"/> <source>Report Bug</source> <translation>Enviar informe de bugs</translation> </message> @@ -78424,7 +78464,7 @@ <translation><b>Enviar informe de Bugs...</b><p>Abre un diálogo para enviar un informe de un error (bug).</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3278"/> + <location filename="../UI/UserInterface.py" line="3285"/> <source>Unittest</source> <translation>Test Unitario</translation> </message> @@ -78664,7 +78704,7 @@ <translation><b>Atajos de Teclado</b><p>Establezca los atajos de teclado para la aplicación con sus valores preferidos.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6313"/> + <location filename="../UI/UserInterface.py" line="6320"/> <source>Export Keyboard Shortcuts</source> <translation>Exportar Atajos de Teclado</translation> </message> @@ -78684,7 +78724,7 @@ <translation><b>Exportar Atajos de Teclado</b><p>Exporte los atajos de teclado de la aplicación.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6337"/> + <location filename="../UI/UserInterface.py" line="6344"/> <source>Import Keyboard Shortcuts</source> <translation>Importar Atajos de Teclado</translation> </message> @@ -78849,7 +78889,7 @@ <translation>Ven&tana</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3189"/> + <location filename="../UI/UserInterface.py" line="3196"/> <source>&Toolbars</source> <translation>&Barra de Herramientas</translation> </message> @@ -78859,77 +78899,77 @@ <translation>P&lugins</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3202"/> + <location filename="../UI/UserInterface.py" line="3209"/> <source>&Help</source> <translation>Ay&uda</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3277"/> + <location filename="../UI/UserInterface.py" line="3284"/> <source>Tools</source> <translation>Herramientas</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3279"/> + <location filename="../UI/UserInterface.py" line="3286"/> <source>Settings</source> <translation>Ajustes</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5111"/> + <location filename="../UI/UserInterface.py" line="5118"/> <source>Help</source> <translation>Ayuda</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3281"/> + <location filename="../UI/UserInterface.py" line="3288"/> <source>Profiles</source> <translation>Perfiles</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3282"/> + <location filename="../UI/UserInterface.py" line="3289"/> <source>Plugins</source> <translation>Plugins</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3664"/> + <location filename="../UI/UserInterface.py" line="3671"/> <source><h3>Version Numbers</h3><table></source> <translation><h3>Números de Versiones</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7302"/> + <location filename="../UI/UserInterface.py" line="7309"/> <source></table></source> <translation></table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3724"/> + <location filename="../UI/UserInterface.py" line="3731"/> <source>Email address or mail server address is empty. Please configure your Email settings in the Preferences Dialog.</source> <translation>La dirección de correo electrónico o la dirección del servidor de correo están en blanco. Por favor configure las opciones de Correo Electrónico en el diálogo de Preferencias.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4090"/> + <location filename="../UI/UserInterface.py" line="4097"/> <source>Configure Tool Groups ...</source> <translation>Configurar Grupos de Herramientas ...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4094"/> + <location filename="../UI/UserInterface.py" line="4101"/> <source>Configure current Tool Group ...</source> <translation>Configurar Grupo de Herramientas actual ...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4045"/> + <location filename="../UI/UserInterface.py" line="4052"/> <source>&Builtin Tools</source> <translation>Herramientas de serie (&builtin)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4062"/> + <location filename="../UI/UserInterface.py" line="4069"/> <source>&Plugin Tools</source> <translation>Herramientas de Extensión (&Plugin)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4210"/> + <location filename="../UI/UserInterface.py" line="4217"/> <source>&Show all</source> <translation>&Ver todo</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4212"/> + <location filename="../UI/UserInterface.py" line="4219"/> <source>&Hide all</source> <translation>&Ocultar todo</translation> </message> @@ -78939,82 +78979,82 @@ <translation type="obsolete">No hay script principal definido para el proyecto actual. Abortando</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5237"/> + <location filename="../UI/UserInterface.py" line="5244"/> <source>Problem</source> <translation>Problema</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5426"/> + <location filename="../UI/UserInterface.py" line="5433"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5111"/> + <location filename="../UI/UserInterface.py" line="5118"/> <source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source> <translation>No hay visor personalizado seleccionado actualmente. Por favor, especifique uno en el diálogo de preferencias.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5145"/> + <location filename="../UI/UserInterface.py" line="5152"/> <source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source> <translation><p>No se ha podido ejecutar el visor de ayuda.<br>Asegúrese de que esta disponible como <b>hh</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5901"/> + <location filename="../UI/UserInterface.py" line="5908"/> <source>Documentation Missing</source> <translation>Falta documentación</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5884"/> + <location filename="../UI/UserInterface.py" line="5891"/> <source>Documentation</source> <translation>Documentación</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5709"/> + <location filename="../UI/UserInterface.py" line="5716"/> <source><p>The PyQt4 documentation starting point has not been configured.</p></source> <translation><P>El punto de entrada de documentación de PyQt4 no ha sido configurado.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6506"/> + <location filename="../UI/UserInterface.py" line="6513"/> <source>Save tasks</source> <translation>Guardar tareas</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6535"/> + <location filename="../UI/UserInterface.py" line="6542"/> <source>Read tasks</source> <translation>Leer tareas</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6902"/> <source>Drop Error</source> <translation>Error de volcado</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7264"/> + <location filename="../UI/UserInterface.py" line="7271"/> <source>Error during updates check</source> <translation>Error durante la verificación de actualización</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7080"/> + <location filename="../UI/UserInterface.py" line="7087"/> <source>&Cancel</source> <translation>&Cancelar</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7245"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Update available</source> <translation>Actualizaciones disponibles</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7264"/> + <location filename="../UI/UserInterface.py" line="7271"/> <source>Could not perform updates check.</source> <translation>No se puede llevar a cabo la verificación de actualizaciones.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7288"/> + <location filename="../UI/UserInterface.py" line="7295"/> <source><h3>Available versions</h3><table></source> <translation><h3>Versiones disponibles</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7339"/> + <location filename="../UI/UserInterface.py" line="7346"/> <source>First time usage</source> <translation>Usado por primera vez</translation> </message> @@ -79074,7 +79114,7 @@ <translation>Restaurando Gestor de Barras de Herramientas...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5371"/> + <location filename="../UI/UserInterface.py" line="5378"/> <source>External Tools</source> <translation>Herramientas Externas</translation> </message> @@ -79089,22 +79129,22 @@ <translation>Visor de &Multiproyecto</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6631"/> + <location filename="../UI/UserInterface.py" line="6638"/> <source>Save session</source> <translation>Guardar sesión</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6615"/> + <location filename="../UI/UserInterface.py" line="6622"/> <source>Read session</source> <translation>Cargar sesión</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3454"/> + <location filename="../UI/UserInterface.py" line="3461"/> <source><p>This part of the status bar displays the current editors encoding.</p></source> <translation><p>Esta zona de la barra de estado muestra la codificación del editor actual.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3468"/> + <location filename="../UI/UserInterface.py" line="3475"/> <source><p>This part of the status bar displays an indication of the current editors files writability.</p></source> <translation><p>Esta zona de la barra de estado muestra una indicación de las propiedades de escritura de los archivos del editor.</p></translation> </message> @@ -79129,17 +79169,17 @@ <translation><b>Solicitar nueva Característica...</b><p>Abre un diálogo para enviar una solicitud de nueva característica.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3447"/> + <location filename="../UI/UserInterface.py" line="3454"/> <source><p>This part of the status bar displays the current editors language.</p></source> <translation><p>Esta zona de la barra de estado muestra el lenguaje del editor actual.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3475"/> - <source><p>This part of the status bar displays the line number of the current editor.</p></source> - <translation><p>Esta zona de la barra de estado muestra el número de línea en el editor actual.</p></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="3482"/> + <source><p>This part of the status bar displays the line number of the current editor.</p></source> + <translation><p>Esta zona de la barra de estado muestra el número de línea en el editor actual.</p></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="3489"/> <source><p>This part of the status bar displays the cursor position of the current editor.</p></source> <translation><p>Esta zona de la barra de estado muestra la posición del cursor en el editor actual.</p></translation> </message> @@ -79169,12 +79209,12 @@ <translation><b>Conmutar la ventana de Caja de Herramientas Horizontal</b><p>Si la ventana de Caja de Herramientas Horizontal está escondida, se muestra. Si está siendo mostrada, se cierra.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4009"/> + <location filename="../UI/UserInterface.py" line="4016"/> <source>Restart application</source> <translation>Reiniciar aplicación</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4009"/> + <location filename="../UI/UserInterface.py" line="4016"/> <source>The application needs to be restarted. Do it now?</source> <translation>La aplicación necesita ser reiniciada. ¿Desea hacerlo ahora?</translation> </message> @@ -79184,7 +79224,7 @@ <translation>Configurar...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3461"/> + <location filename="../UI/UserInterface.py" line="3468"/> <source><p>This part of the status bar displays the current editors eol setting.</p></source> <translation><p>Esta zona de la barra de estado muestra la configuración actual de fin de línea (eol) para los editores.</p></translation> </message> @@ -79324,7 +79364,7 @@ <translation>Editor de &Iconos...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5058"/> + <location filename="../UI/UserInterface.py" line="5065"/> <source>Qt 3 support</source> <translation>Soporte para Qt 3</translation> </message> @@ -79359,111 +79399,111 @@ <translation>{0} - {1} - {2} - Modo Pasivo</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3558"/> + <location filename="../UI/UserInterface.py" line="3565"/> <source>External Tools/{0}</source> <translation>Herramientas Externas/{0}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5237"/> + <location filename="../UI/UserInterface.py" line="5244"/> <source><p>The file <b>{0}</b> does not exist or is zero length.</p></source> <translation><p>El archivo <b>{0}</b> no existe o tiene longitud nula. </p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4961"/> + <location filename="../UI/UserInterface.py" line="4968"/> <source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>No se ha podido ejecutar Qt-Designer.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5030"/> + <location filename="../UI/UserInterface.py" line="5037"/> <source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>No se ha podido ejecutar Qt-Linguist.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5083"/> + <location filename="../UI/UserInterface.py" line="5090"/> <source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>No se ha podido ejecutar Qt-Assistant.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5125"/> + <location filename="../UI/UserInterface.py" line="5132"/> <source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>No se ha podido ejecutar el visor personalizado.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5193"/> + <location filename="../UI/UserInterface.py" line="5200"/> <source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>No se ha podido ejecutar el Previsualizador de UI.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5248"/> + <location filename="../UI/UserInterface.py" line="5255"/> <source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>No se ha podido ejecutar el Previsualizador de Traducciones.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5269"/> + <location filename="../UI/UserInterface.py" line="5276"/> <source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>No se ha podido iniciar el navegador SQL.<br>Asegúrese de que está disponible como <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5362"/> + <location filename="../UI/UserInterface.py" line="5369"/> <source>No tool entry found for external tool '{0}' in tool group '{1}'.</source> <translation>No se ha encontrado la entrada para la herramienta externa '{0}' en el grupo de herramientas '{1}'.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5371"/> + <location filename="../UI/UserInterface.py" line="5378"/> <source>No toolgroup entry '{0}' found.</source> <translation>No se ha encontrado la entrada para el grupo de herramientas '{0}'.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5410"/> + <location filename="../UI/UserInterface.py" line="5417"/> <source>Starting process '{0} {1}'. </source> <translation>Comenzando proceso '{0} {1}'. </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5426"/> + <location filename="../UI/UserInterface.py" line="5433"/> <source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source> <translation><p>No se ha podido ejecutar la entrada de herramienta <b>{0}</b>.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5502"/> + <location filename="../UI/UserInterface.py" line="5509"/> <source>Process '{0}' has exited. </source> <translation>El proceso '{0}' ha finalizado. </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5901"/> + <location filename="../UI/UserInterface.py" line="5908"/> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation><P>El punto de entrada de documentación "<b>{0}</b>" no ha podido encontrarse.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6506"/> + <location filename="../UI/UserInterface.py" line="6513"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation><p>El archivo de tareas <b>{0}</b> no pudo ser guardado.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6535"/> + <location filename="../UI/UserInterface.py" line="6542"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo de tareas <b>{0}</b> no puede leerse.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6569"/> + <location filename="../UI/UserInterface.py" line="6576"/> <source><p>The session file <b>{0}</b> could not be written.</p></source> <translation><p>El archivo de sesión <b>{0}</b> no ha podido guardarse.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6615"/> + <location filename="../UI/UserInterface.py" line="6622"/> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation><p>El archivo de sesión <b></b> no ha podido ser leído.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6902"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> no es un archivo.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7089"/> + <location filename="../UI/UserInterface.py" line="7096"/> <source>Trying host {0}</source> <translation>Probando host {0}</translation> </message> @@ -79498,7 +79538,7 @@ <translation>Alt+Shift+B</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6337"/> + <location filename="../UI/UserInterface.py" line="6344"/> <source>Keyboard shortcut file (*.e4k)</source> <translation>Archivo de atajos de teclado (*.e4k)</translation> </message> @@ -79538,27 +79578,27 @@ <translation><b>Documentación de Python 2</b><p>Mostrar la documentación de Python 2. Si no se ha configurado un directorio con esta documentación, la ubicación de la documentación de Python 2 se asumirá en el directorio de documentación bajo la ubicación del ejecutable configurado de Python 2 en Windows, y en <i>/usr/share/doc/packages/python/html/python-docs-html</i> para Unix. Establezca el valor de la variable de entorno PYTHON2DOCDIR para sobreescribir estas opciones. </p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7153"/> + <location filename="../UI/UserInterface.py" line="7160"/> <source>Error getting versions information</source> <translation>Error al obtener información de versiones</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7146"/> - <source>The versions information could not be downloaded. Please go online and try again.</source> - <translation>La información de versiones no se ha podido descargar. Póngase online por favor e inténtelo de nuevo.</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="6103"/> - <source>Open Browser</source> - <translation>Abrir Navegador</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="6103"/> - <source>Could not start a web browser</source> - <translation>No se ha podido iniciar el navegador web</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7153"/> + <source>The versions information could not be downloaded. Please go online and try again.</source> + <translation>La información de versiones no se ha podido descargar. Póngase online por favor e inténtelo de nuevo.</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="6110"/> + <source>Open Browser</source> + <translation>Abrir Navegador</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="6110"/> + <source>Could not start a web browser</source> + <translation>No se ha podido iniciar el navegador web</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7160"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation>La información de versiones no se ha podido descargar en los últimos 7 días. Póngase por favor online e inténtelo de nuevo.</translation> </message> @@ -79644,12 +79684,12 @@ <translation><b>Captura de Pantalla</b><p>Abre un diálogo para tomar capturas de pantalla de una región de la pantalla.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5339"/> + <location filename="../UI/UserInterface.py" line="5346"/> <source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>No se ha podido ejecutar la herramienta de Captura de Pantalla.<br>Asegúrese de que esta disponible como <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7358"/> + <location filename="../UI/UserInterface.py" line="7365"/> <source>Select Workspace Directory</source> <translation>Seleccionar Directorio para el Espacio de Trabajo</translation> </message> @@ -80019,7 +80059,7 @@ <translation>Abrir Documentación de PyQt5</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5771"/> + <location filename="../UI/UserInterface.py" line="5778"/> <source><p>The PyQt5 documentation starting point has not been configured.</p></source> <translation><P>El punto de entrada de documentación de PyQt5 no ha sido configurado.</p></translation> </message> @@ -80029,7 +80069,7 @@ <translation><b>Documentación de Python 3</b><p>Mostrar la documentación de Python 3. Si no se ha configurado un directorio con lesta documentación, la ubicación de la documentación de Python 3 se asumirá en el directorio de documentación bajo la ubicación del ejecutable de Python 3 en Windows, y en <i>/usr/share/doc/packages/python/html</i> para Unix. Establezca el valor de la variable de entorno PYTHON3DOCDIR para sobreescribir estas opciones. </p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7080"/> + <location filename="../UI/UserInterface.py" line="7087"/> <source>%v/%m</source> <translation>%v/%m</translation> </message> @@ -80049,7 +80089,7 @@ <translation><b>Mostrar registro de errores...</b><p>Abre un diálogo mostrando el registro más reciente de errores.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7084"/> + <location filename="../UI/UserInterface.py" line="7091"/> <source>Version Check</source> <translation>Verificación de Versión</translation> </message> @@ -80119,27 +80159,27 @@ <translation><b>Documentación de API de Eric</b><p>Muestra la documentación de API de Eric. La ubicación de la documentación es el subdirectorio Documentation/Source del directorio de instalación de eric6.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5058"/> + <location filename="../UI/UserInterface.py" line="5065"/> <source>Qt v.3 is not supported by eric6.</source> <translation>Qt v.3 no está soportado por eric6.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7245"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation>La actualización para <b>{0}</b> de eric6 está disponible en <b>{1}</b>. ¿Le gustaría obtenerla?</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7257"/> + <location filename="../UI/UserInterface.py" line="7264"/> <source>Eric6 is up to date</source> <translation>Eric6 está actualizado</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7257"/> + <location filename="../UI/UserInterface.py" line="7264"/> <source>You are using the latest version of eric6</source> <translation>Está utilizando la última versión de eric6</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7339"/> + <location filename="../UI/UserInterface.py" line="7346"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation>Eric6 todavía no está configurado. El diálogo de configuración va a ser iniciado.</translation> </message> @@ -80149,17 +80189,17 @@ <translation>Generando Barras de Herramientas para Plugins...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4065"/> + <location filename="../UI/UserInterface.py" line="4072"/> <source>&User Tools</source> <translation>Herramientas de &Usuario</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4137"/> + <location filename="../UI/UserInterface.py" line="4144"/> <source>No User Tools Configured</source> <translation>No se han Configurado Herramientas de Usuario</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7100"/> + <location filename="../UI/UserInterface.py" line="7107"/> <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> <translation>La información de versiones no se puede descargar porque está <b>sin línea</b>. Por favor, póngase en línea e inténtelo de nuevo.</translation> </message> @@ -80204,7 +80244,7 @@ <translation><b>Guardar sesión...</b><p>Guarda la sesión actual a disco. Se muestra un diálogo para seleccionar el nombre de archivo.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6653"/> + <location filename="../UI/UserInterface.py" line="6660"/> <source>Load session</source> <translation>Cargar sesión</translation> </message> @@ -80219,17 +80259,17 @@ <translation><b>Cargar sesión...</b><p>Carga una sesión guardada en disco anteriormente. Se muestra un diálogo para seleccionar el nombre de archivo.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6653"/> + <location filename="../UI/UserInterface.py" line="6660"/> <source>eric6 Session Files (*.e5s)</source> <translation>Archivos de Sesión de eric6 (*.e5s)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6700"/> + <location filename="../UI/UserInterface.py" line="6707"/> <source>Crash Session found!</source> <translation>¡Se ha hallado una sesión perdida!</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6700"/> + <location filename="../UI/UserInterface.py" line="6707"/> <source>A session file of a crashed session was found. Shall this session be restored?</source> <translation>Se ha encontrado un archivo de sesió para una sesión perdida. ¿Desea restaurar esta sesión?</translation> </message> @@ -80244,17 +80284,17 @@ <translation>Inicializando Plugins...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7233"/> + <location filename="../UI/UserInterface.py" line="7240"/> <source>Update Check</source> <translation>Comprobación Actualización</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7233"/> + <location filename="../UI/UserInterface.py" line="7240"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation>Ha instalado eric directamente a partir del código fuente. No es posible comprobar la disponibilidad de una actuación.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7223"/> + <location filename="../UI/UserInterface.py" line="7230"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation>Ésta es una snapshot release the eric6. Una release estable más reciente podría estar disponible.</translation> </message> @@ -80309,7 +80349,7 @@ <translation><b>Documentación de PySide2</b><p>Muestra la Documentación de PySide2. Dependiendo de la configuración, esta documentación será mostrará en el visor de ayuda interno de Eric, o se ejecutará en un navegador web, o Qt Assistant.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5884"/> + <location filename="../UI/UserInterface.py" line="5891"/> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation><P>El punto de entrada de documentación de PySide{0} no ha sido configurado.</p></translation> </message> @@ -80344,22 +80384,22 @@ <translation><b>Configurador de Virtualenv</b><p>Abre un diálogo para introducir todos los parámetros necesarios para crear un entorno virtual de Python utilizando virtualenv o pyvenv.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3128"/> + <location filename="../UI/UserInterface.py" line="3135"/> <source>Left Side</source> <translation>Lado Izquierdo</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3144"/> + <location filename="../UI/UserInterface.py" line="3151"/> <source>Bottom Side</source> <translation>Lado Inferior</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3155"/> + <location filename="../UI/UserInterface.py" line="3162"/> <source>Right Side</source> <translation>Lado Derecho</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3179"/> + <location filename="../UI/UserInterface.py" line="3186"/> <source>Plug-ins</source> <translation>Plugins</translation> </message> @@ -80385,17 +80425,17 @@ <translation><b>Reiniciar la IDE</b><p>Reinicia la IDE. Todos los cambios sin guardar pueden ser guardados primero. Cualquier programa de Python que esté en depuración será detenido, y las preferencias se guardarán en disco.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6058"/> + <location filename="../UI/UserInterface.py" line="6065"/> <source>Start Web Browser</source> <translation>Iniciar Navegador Web</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6000"/> + <location filename="../UI/UserInterface.py" line="6007"/> <source>The eric6 web browser could not be started.</source> <translation>El navegador web de eric 6 no se ha podido iniciar.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6058"/> + <location filename="../UI/UserInterface.py" line="6065"/> <source><p>The eric6 web browser is not started.</p><p>Reason: {0}</p></source> <translation><p>El navegador web de eric6 no se ha iniciado.</p><p>Razón: {0}</p></translation> </message> @@ -80410,7 +80450,7 @@ <translation>PyPI</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3493"/> + <location filename="../UI/UserInterface.py" line="3500"/> <source><p>This part of the status bar allows zooming the current editor or shell.</p></source> <translation><p>Esta zona de la barra de estado permite hacer zoom sobre el editor actual o la shell.</p></translation> </message> @@ -80484,6 +80524,11 @@ <source><b>MicroPython</b><p>This switches the input focus to the MicroPython window.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../UI/UserInterface.py" line="3128"/> + <source>Central Park</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name> @@ -90418,17 +90463,17 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <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="2066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <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="2075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <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> @@ -90439,31 +90484,31 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/> <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="2051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <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="1416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1427"/> <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="1436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1447"/> <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> @@ -90472,12 +90517,12 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1481"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -90494,14 +90539,14 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Head #{0}</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Parent #{0}</b></td><td></td></tr>
--- a/eric6/i18n/eric6_fr.ts Fri Aug 23 13:23:22 2019 +0200 +++ b/eric6/i18n/eric6_fr.ts Fri Aug 23 13:23:36 2019 +0200 @@ -6939,7 +6939,7 @@ <message> <location filename="../Debugger/DebugUI.py" line="597"/> <source>&Start</source> - <translation>&Lancer</translation> + <translation type="obsolete">&Lancer</translation> </message> <message> <location filename="../Debugger/DebugUI.py" line="642"/> @@ -7129,6 +7129,11 @@ <source>No locals available.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Debugger/DebugUI.py" line="597"/> + <source>Sta&rt</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DebugViewer</name> @@ -31232,7 +31237,7 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -31262,420 +31267,420 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="630"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="691"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="760"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/> <source>Reverting changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1061"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1361"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1983"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2377"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2401"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2414"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2656"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2223"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2687"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2608"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <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="2737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2544"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2647"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2802"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2782"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2550"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <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="2818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2829"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2822"/> <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="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="555"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3426"/> <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="3523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2897"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2938"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2949"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2996"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3052"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3101"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3292"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3280"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> <source>Revert changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="984"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="995"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3156"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1787"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Impossible de lancer le processus {0}. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="954"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3689"/> <source>Mercurial Bookmark</source> <translation type="unfinished">Signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/> <source>Delete Bookmark</source> <translation type="unfinished">Supprimer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished">Selectionner le signet à supprimer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished">Supprimer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3755"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished">Renommer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3797"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished">Déplacer le signet Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/> <source>Pull Bookmark</source> <translation type="unfinished">Récuperer le signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished">Sélectionner le signet à récuperer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3903"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished">Récupérant le signet d'un dépôt Mercurial distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/> <source>Push Bookmark</source> <translation type="unfinished">Envoyer signet</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/> <source>Select the bookmark to be push:</source> <translation type="unfinished">Sélectionner le signet à envoyer:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3947"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished">À envoyer le signet à un dépôt Mercurial distant</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1098"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/> - <source>Canceling uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3113"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3126"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <source>Aborting uncommitted merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -35413,432 +35418,432 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>Tag in repository</source> <translation type="unfinished">Etiqueter au niveau du référentiel (tag)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>&Tag in repository...</source> <translation type="unfinished">&Etiqueter dans le référentiel...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> - <source>Tag the local project in the repository</source> - <translation type="unfinished">Etiquette le projet local dans le référentiel</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation type="unfinished"><b>Etiqueter dans le référentiel</b><p>Etiquette le projet local dans le référentiel (opération "tag").</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> - <source>List tags</source> - <translation type="unfinished">Lister les étiquettes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> - <source>List tags...</source> - <translation type="unfinished">Lister les étiquettes...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> - <source>List tags of the project</source> - <translation type="unfinished">Liste les étiquettes du projet</translation> + <source>Tag the local project in the repository</source> + <translation type="unfinished">Etiquette le projet local dans le référentiel</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation type="unfinished"><b>Liste des étiquettes</b><p>Liste les étiquettes du projet.</p></translation> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation type="unfinished"><b>Etiqueter dans le référentiel</b><p>Etiquette le projet local dans le référentiel (opération "tag").</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>List branches</source> - <translation type="unfinished">Lister les branches</translation> + <source>List tags</source> + <translation type="unfinished">Lister les étiquettes</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>List branches...</source> - <translation type="unfinished">Lister les branches...</translation> + <source>List tags...</source> + <translation type="unfinished">Lister les étiquettes...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/> - <source>List branches of the project</source> - <translation type="unfinished">Liste les branches du projet</translation> + <source>List tags of the project</source> + <translation type="unfinished">Liste les étiquettes du projet</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation type="unfinished"><b>Liste des branches</b><p>Effectue la liste de toutes les branches de développement du projet.</p></translation> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation type="unfinished"><b>Liste des étiquettes</b><p>Liste les étiquettes du projet.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> - <source>Create branch</source> - <translation type="unfinished"></translation> + <source>List branches</source> + <translation type="unfinished">Lister les branches</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <source>List branches...</source> + <translation type="unfinished">Lister les branches...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> + <source>List branches of the project</source> + <translation type="unfinished">Liste les branches du projet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation type="unfinished"><b>Liste des branches</b><p>Effectue la liste de toutes les branches de développement du projet.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> + <source>Create branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Create &branch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/> <source>Create a new branch for the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> <source>Close branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> <source>Close the current branch of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source>Switch</source> <translation type="unfinished">Basculer de version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source>S&witch...</source> <translation type="unfinished">&Basculer de version...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source>Switch the working directory to another revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> - <source>Cleanup</source> - <translation type="unfinished">Nettoyer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> - <source>Cleanu&p</source> - <translation type="unfinished">&Nettoyer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source>Cleanup the local project</source> - <translation type="unfinished">Nettoyer le projet local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation type="unfinished"><b>Nettoyer</b><p>Permet de nettoyer le projet local.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source>Execute command</source> - <translation type="unfinished">Exécuter une commande</translation> + <source>Cleanup</source> + <translation type="unfinished">Nettoyer</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source>E&xecute command...</source> - <translation type="unfinished">E&xécuter une commande...</translation> + <source>Cleanu&p</source> + <translation type="unfinished">&Nettoyer</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> - <source>Execute an arbitrary Mercurial command</source> - <translation type="unfinished"></translation> + <source>Cleanup the local project</source> + <translation type="unfinished">Nettoyer le projet local</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation type="unfinished"><b>Nettoyer</b><p>Permet de nettoyer le projet local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source>Execute command</source> + <translation type="unfinished">Exécuter une commande</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source>E&xecute command...</source> + <translation type="unfinished">E&xécuter une commande...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> + <source>Execute an arbitrary Mercurial command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source>Configure</source> <translation type="unfinished">Configuration</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source>Configure...</source> <translation type="unfinished">Configuration...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> - <source>Show paths</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> - <source>Show paths...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> - <source>Show the aliases for remote repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> - <source>Verify repository</source> + <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> - <source>Verify repository...</source> + <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> - <source>Verify the integrity of the repository</source> + <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Recover</source> + <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Recover...</source> + <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> - <source>Recover from an interrupted transaction</source> + <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <source>Recover</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <source>Recover...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <source>Recover from an interrupted transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> - <source>Create .hgignore</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> - <source>Create a .hgignore file with default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <source>Create .hgignore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/> <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1863"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1362"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <source>Show current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source>Show the current branch of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Mark as "good"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="830"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> - <source>Mark as "bad"</source> + <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> - <source>Mark a selectable changeset as bad</source> + <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> - <source>Skip</source> - <translation type="unfinished">Passer</translation> + <source>Mark as "bad"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> + <source>Mark a selectable changeset as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <source>Skip</source> + <translation type="unfinished">Passer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> <source>Reset</source> <translation type="unfinished">Réinitialiser</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1375"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Mark as "good"...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> @@ -35858,312 +35863,312 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> - <source>Serve project repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> - <source>Serve the project repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> - <source><b>Serve project repository</b><p>This serves the project repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656"/> - <source>Pull</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/> - <source>The project should be reread. Do this now?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> - <source>Push new branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> - <source>Push the current branch of the local project as a new named branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> - <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> - <source>Rollback last transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> - <source>Rollback the last transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> - <source>Extensions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> - <source>Edit user configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> - <source>Edit user configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Show an editor to edit the user configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> - <source>Edit repository configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> - <source>Show an editor to edit the repository configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> - <source>Show the combined configuration settings from all configuration files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> - <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> - <source>Skip...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> - <source>Skip a selectable changeset</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> - <source><b>Skip</b><p>This skips a selectable changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1895"/> - <source>Import Patch</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <source>Serve project repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> + <source>Serve the project repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> + <source><b>Serve project repository</b><p>This serves the project repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1674"/> + <source>Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Push new branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/> + <source>Push the current branch of the local project as a new named branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> + <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> + <source>Rollback last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> + <source>Rollback the last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1420"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <source>Show an editor to edit the user configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <source>Show an editor to edit the repository configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Show the combined configuration settings from all configuration files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <source>Skip...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <source>Skip a selectable changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <source><b>Skip</b><p>This skips a selectable changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1919"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1939"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> - <source>Export revisions to patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="961"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source>Change Phase...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> - <source>Change the phase of revisions</source> + <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <source>Change Phase...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="989"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1959"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1020"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1974"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Add</source> <translation type="unfinished">Ajouter</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Add...</source> <translation type="unfinished">Ajouter...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Remove</source> <translation type="unfinished">Supprimer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1080"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1424"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -36193,32 +36198,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="917"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1328"/> <source>Administration</source> <translation type="unfinished"></translation> </message> @@ -36243,338 +36248,353 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> + <source>List bookmarks</source> + <translation type="unfinished">Lister les signets</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> + <source>List bookmarks...</source> + <translation type="unfinished">Lister les signets ...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/> + <source>List bookmarks of the project</source> + <translation type="unfinished">Lister les signets du projet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1112"/> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation type="unfinished"><b>Lister les signets</b><p>Ceci liste tous les signets du projet.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> + <source>Define bookmark</source> + <translation type="unfinished">Définir signet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> + <source>Define bookmark...</source> + <translation type="unfinished">Définir signet ...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/> + <source>Define a bookmark for the project</source> + <translation type="unfinished">Définir un signet pour le projet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1127"/> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <translation type="unfinished"><b>Définir un signet</b><p>Ceci défini un signet pour le projet.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> + <source>Delete bookmark</source> + <translation type="unfinished">Supprimer signet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> + <source>Delete bookmark...</source> + <translation type="unfinished">Supprimer signet ...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/> + <source>Delete a bookmark of the project</source> + <translation type="unfinished">Supprimer un signet du projet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142"/> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation type="unfinished"><b>Supprimer signet</b><p>Ceci supprime un signet du projet.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> + <source>Rename bookmark</source> + <translation type="unfinished">Renommer signet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> + <source>Rename bookmark...</source> + <translation type="unfinished">Renommer signet ...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> + <source>Rename a bookmark of the project</source> + <translation type="unfinished">Renommer un signet du projet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1157"/> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation type="unfinished"><b>Renommer signet</b><p>Ceci renome un signet du projet.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> + <source>Move bookmark</source> + <translation type="unfinished">Déplacer signet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> + <source>Move bookmark...</source> + <translation type="unfinished">Déplacer signet ...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> + <source>Move a bookmark of the project</source> + <translation type="unfinished">Déplacer un signet du projet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1172"/> + <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> + <translation type="unfinished"><b>Déplacer signet</b><p>Ceci déplace un signet du projet dans un autre ensemble.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1180"/> + <source>Show incoming bookmarks</source> + <translation type="unfinished">Montrer nouveaux signets</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> + <source>Show a list of incoming bookmarks</source> + <translation type="unfinished">Montrer la liste des nouveaux signets</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1188"/> + <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> + <translation type="unfinished"><b>Montrer les nouveaux signets</b><p>Cedi montre la liste des nouveaux signets disponibles dans le dépôt distant. </p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> + <source>Pull bookmark</source> + <translation type="unfinished">Télécharger signet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> + <source>Pull a bookmark from a remote repository</source> + <translation type="unfinished">Télecharger un sginet d'un répertoire distant</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1205"/> + <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> + <translation type="unfinished"><b>Télécharger signet</b><p>Ceci télécharge un signe d'un répertoire distant dans le répertoire local. </p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1229"/> + <source>Show outgoing bookmarks</source> + <translation type="unfinished">Montrer signets sortants</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> + <source>Show a list of outgoing bookmarks</source> + <translation type="unfinished">Montrer la list des signets sortants</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1237"/> + <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> + <translation type="unfinished"><b>Montrer les signets sortants</b><p>Ceci montre la liste des signets disponibles dans le répertoire local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1246"/> + <source>Push bookmark</source> + <translation type="unfinished">Envoyer signet</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> + <source>Push a bookmark to a remote repository</source> + <translation type="unfinished">Envoyer un signet dans un répertoire distant</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1254"/> + <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> + <translation type="unfinished"><b>Envoyer signet</b><p>Ceci envoie un signet depuis un répertoire local dans un répertoire distant. </p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399"/> + <source>Bookmarks</source> + <translation type="unfinished">Signets</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1383"/> + <source>Tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390"/> + <source>Branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/> + <source>Re-Merge all conflicting, unresolved files of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> + <source>Show conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> + <source>Show conflicts...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> + <source>Show a dialog listing all files with conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> + <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> + <source>Mark all conflicts of the local project as unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> + <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="459"/> + <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1528"/> + <source>Mercurial</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> + <source>Pull current bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> + <source>Pull the current bookmark from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1221"/> + <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1262"/> + <source>Push current bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1267"/> + <source>Push the current bookmark to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1279"/> + <source>Delete all backups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1284"/> + <source>Delete all backup bundles stored in the backup area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1287"/> + <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/> + <source>Stop Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> + <source>Stop the interrupted copying session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <source>Abort Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> + <source>Abort the interrupted copying session and rollback</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> + <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1445"/> + <source>Merge Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1988"/> + <source>Copy Changesets (Stop)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/> + <source>Copy Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> + <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> - <source>Cancel uncommitted merge</source> + <source>Commit Merge</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> - <source>Cancel an uncommitted merge and lose all changes</source> + <source>Commit a merge.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> - <source>List bookmarks</source> - <translation type="unfinished">Lister les signets</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> - <source>List bookmarks...</source> - <translation type="unfinished">Lister les signets ...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> - <source>List bookmarks of the project</source> - <translation type="unfinished">Lister les signets du projet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation type="unfinished"><b>Lister les signets</b><p>Ceci liste tous les signets du projet.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> - <source>Define bookmark</source> - <translation type="unfinished">Définir signet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> - <source>Define bookmark...</source> - <translation type="unfinished">Définir signet ...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1110"/> - <source>Define a bookmark for the project</source> - <translation type="unfinished">Définir un signet pour le projet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation type="unfinished"><b>Définir un signet</b><p>Ceci défini un signet pour le projet.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> - <source>Delete bookmark</source> - <translation type="unfinished">Supprimer signet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> - <source>Delete bookmark...</source> - <translation type="unfinished">Supprimer signet ...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125"/> - <source>Delete a bookmark of the project</source> - <translation type="unfinished">Supprimer un signet du projet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation type="unfinished"><b>Supprimer signet</b><p>Ceci supprime un signet du projet.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> - <source>Rename bookmark</source> - <translation type="unfinished">Renommer signet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> - <source>Rename bookmark...</source> - <translation type="unfinished">Renommer signet ...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1140"/> - <source>Rename a bookmark of the project</source> - <translation type="unfinished">Renommer un signet du projet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation type="unfinished"><b>Renommer signet</b><p>Ceci renome un signet du projet.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> - <source>Move bookmark</source> - <translation type="unfinished">Déplacer signet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> - <source>Move bookmark...</source> - <translation type="unfinished">Déplacer signet ...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155"/> - <source>Move a bookmark of the project</source> - <translation type="unfinished">Déplacer un signet du projet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1158"/> - <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> - <translation type="unfinished"><b>Déplacer signet</b><p>Ceci déplace un signet du projet dans un autre ensemble.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> - <source>Show incoming bookmarks</source> - <translation type="unfinished">Montrer nouveaux signets</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/> - <source>Show a list of incoming bookmarks</source> - <translation type="unfinished">Montrer la liste des nouveaux signets</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1174"/> - <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> - <translation type="unfinished"><b>Montrer les nouveaux signets</b><p>Cedi montre la liste des nouveaux signets disponibles dans le dépôt distant. </p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> - <source>Pull bookmark</source> - <translation type="unfinished">Télécharger signet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1188"/> - <source>Pull a bookmark from a remote repository</source> - <translation type="unfinished">Télecharger un sginet d'un répertoire distant</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1191"/> - <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> - <translation type="unfinished"><b>Télécharger signet</b><p>Ceci télécharge un signe d'un répertoire distant dans le répertoire local. </p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> - <source>Show outgoing bookmarks</source> - <translation type="unfinished">Montrer signets sortants</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/> - <source>Show a list of outgoing bookmarks</source> - <translation type="unfinished">Montrer la list des signets sortants</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223"/> - <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> - <translation type="unfinished"><b>Montrer les signets sortants</b><p>Ceci montre la liste des signets disponibles dans le répertoire local.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1232"/> - <source>Push bookmark</source> - <translation type="unfinished">Envoyer signet</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1237"/> - <source>Push a bookmark to a remote repository</source> - <translation type="unfinished">Envoyer un signet dans un répertoire distant</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1240"/> - <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> - <translation type="unfinished"><b>Envoyer signet</b><p>Ceci envoie un signet depuis un répertoire local dans un répertoire distant. </p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1383"/> - <source>Bookmarks</source> - <translation type="unfinished">Signets</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> - <source>Tags</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1374"/> - <source>Branches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> - <source>Re-Merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> - <source>Re-Merge all conflicting, unresolved files of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> - <source>Show conflicts</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> - <source>Show conflicts...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> - <source>Show a dialog listing all files with conflicts</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> - <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> - <source>Conflicts unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> - <source>Mark all conflicts of the local project as unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> - <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="445"/> - <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511"/> - <source>Mercurial</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> - <source>Pull current bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/> - <source>Pull the current bookmark from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1207"/> - <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> - <source>Push current bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/> - <source>Push the current bookmark to a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> - <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> - <source>Delete all backups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> - <source>Delete all backup bundles stored in the backup area</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1273"/> - <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> - <source>Stop Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1018"/> - <source>Stop the interrupted copying session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/> - <source>Abort Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> - <source>Abort the interrupted copying session and rollback</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> - <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1429"/> - <source>Merge Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1964"/> - <source>Copy Changesets (Stop)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/> - <source>Copy Changesets (Abort)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> + <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <source>Abort Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> + <source>Abort an uncommitted merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443"/> + <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> </context> @@ -47732,202 +47752,202 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="853"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="854"/> <source>Serial Device Connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="853"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="854"/> <source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="898"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="899"/> <source>Run Script</source> <translation type="unfinished">Lancer le script</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="881"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="882"/> <source>There is no editor open. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="889"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="890"/> <source>The current editor does not contain a script. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="898"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="899"/> <source><p>Cannot run script.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="922"/> <source>Open Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="922"/> <source>Python3 Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="965"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="966"/> <source>Start Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="965"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="966"/> <source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="995"/> <source>Unsaved Chart Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="995"/> <source>The chart contains unsaved data.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/> <source>Start File Manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/> <source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1097"/> <source>Show Version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1100"/> <source>Show Implementation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> <source>Synchronize Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1108"/> <source>Show Device Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1111"/> <source>Show Local Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1339"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1361"/> <source>Compile Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1359"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1381"/> <source>Compile Current Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1132"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1135"/> <source><h3>Device Version Information</h3></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1141"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1144"/> <source>No version information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1143"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1146"/> <source>Device Version Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1166"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1169"/> <source>unknown</source> <translation type="unfinished">inconnu</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/> <source>Device Implementation Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/> <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> <source><p>The time of the connected device was synchronized with the local time.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1216"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1219"/> <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1224"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1227"/> <source><h3>Device Date and Time</h3><p>{0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1238"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1241"/> <source>Device Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/> <source>Local Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/> <source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/> <source>Error handling device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/> <source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1291"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1313"/> <source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1309"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1331"/> <source>Python Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1319"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1341"/> <source>The Python file <b>{0}</b> does not exist. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1329"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1351"/> <source>'mpy-cross' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1352"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> <source>The current editor does not contain a Python file. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -47942,12 +47962,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="978"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="979"/> <source>µPy Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1059"/> <source>µPy Files</source> <translation type="unfinished"></translation> </message> @@ -78237,7 +78257,7 @@ <translation><b>Afficher les versions</b><p>Affiche les informations sur les versions.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3724"/> + <location filename="../UI/UserInterface.py" line="3731"/> <source>Report Bug</source> <translation>Rapport de bogue</translation> </message> @@ -78257,7 +78277,7 @@ <translation><b>Rapport de bogue...</b><p>Ouvre une fenêtre pour envoyer un rapport de bogue.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3278"/> + <location filename="../UI/UserInterface.py" line="3285"/> <source>Unittest</source> <translation>Tests unitaires</translation> </message> @@ -78312,7 +78332,7 @@ <translation><b>Raccourcis claviers</b><p>Edite les raccourcis claviers pour l'application.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6313"/> + <location filename="../UI/UserInterface.py" line="6320"/> <source>Export Keyboard Shortcuts</source> <translation>Exporter les raccourcis clavier</translation> </message> @@ -78332,7 +78352,7 @@ <translation><b>Exporter les raccourcis clavier</b><p>Exporte les raccourcis claviers de l'application.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6337"/> + <location filename="../UI/UserInterface.py" line="6344"/> <source>Import Keyboard Shortcuts</source> <translation>Importer des raccourcis clavier</translation> </message> @@ -78362,37 +78382,37 @@ <translation>&Fenêtre</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3202"/> + <location filename="../UI/UserInterface.py" line="3209"/> <source>&Help</source> <translation>A&ide</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3277"/> + <location filename="../UI/UserInterface.py" line="3284"/> <source>Tools</source> <translation>Outils</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5111"/> + <location filename="../UI/UserInterface.py" line="5118"/> <source>Help</source> <translation>Aide</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3279"/> + <location filename="../UI/UserInterface.py" line="3286"/> <source>Settings</source> <translation>Configuration</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3189"/> + <location filename="../UI/UserInterface.py" line="3196"/> <source>&Toolbars</source> <translation>&Barres d'Outils</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5237"/> + <location filename="../UI/UserInterface.py" line="5244"/> <source>Problem</source> <translation>Problème</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5426"/> + <location filename="../UI/UserInterface.py" line="5433"/> <source>Process Generation Error</source> <translation>Erreur du processus</translation> </message> @@ -78508,7 +78528,7 @@ <translation type="obsolete">Il n'y a pas de script principal défini dans le projet en cours. Abandon</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6902"/> <source>Drop Error</source> <translation>Erreur de suppression</translation> </message> @@ -78643,27 +78663,27 @@ <translation>Visualisueur de tâches</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6506"/> + <location filename="../UI/UserInterface.py" line="6513"/> <source>Save tasks</source> <translation>Enregistrement des tâches</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6535"/> + <location filename="../UI/UserInterface.py" line="6542"/> <source>Read tasks</source> <translation>Lecture des tâches</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5111"/> + <location filename="../UI/UserInterface.py" line="5118"/> <source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source> <translation>Aucun visualiseur personalisé n'est sélectionné. Prière d'en spécifier un dans les préférences.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5901"/> + <location filename="../UI/UserInterface.py" line="5908"/> <source>Documentation Missing</source> <translation>Documentation Manquante</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3724"/> + <location filename="../UI/UserInterface.py" line="3731"/> <source>Email address or mail server address is empty. Please configure your Email settings in the Preferences Dialog.</source> <translation>L'adresse mail ou l'adresse du serveur mail est vide. Veuillez configurer vos paramètres mails dans la fenêtre des Préférences.</translation> </message> @@ -78758,7 +78778,7 @@ <translation>Ouvre la documentation sur les APIs Eric</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5145"/> + <location filename="../UI/UserInterface.py" line="5152"/> <source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source> <translation><p>Impossible de démarrer le visualiseur d'aide.<br>Assurez-vous qu'il est bien ici <b>hh</b>.</p></translation> </message> @@ -78829,62 +78849,62 @@ <translation>&Configuration</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3281"/> + <location filename="../UI/UserInterface.py" line="3288"/> <source>Profiles</source> <translation>Profils</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4045"/> + <location filename="../UI/UserInterface.py" line="4052"/> <source>&Builtin Tools</source> <translation>Outils &internes</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5884"/> + <location filename="../UI/UserInterface.py" line="5891"/> <source>Documentation</source> <translation>Documentation</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5709"/> + <location filename="../UI/UserInterface.py" line="5716"/> <source><p>The PyQt4 documentation starting point has not been configured.</p></source> <translation><p>L'emplacement de la documentation PyQt4 n'a pas été configuré.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7264"/> + <location filename="../UI/UserInterface.py" line="7271"/> <source>Error during updates check</source> <translation>Erreur durant la recherche de mises à jour</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7245"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Update available</source> <translation>Mise à jour disponible</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3664"/> + <location filename="../UI/UserInterface.py" line="3671"/> <source><h3>Version Numbers</h3><table></source> <translation><h3>Numéros de version</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7302"/> + <location filename="../UI/UserInterface.py" line="7309"/> <source></table></source> <translation></table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6103"/> + <location filename="../UI/UserInterface.py" line="6110"/> <source>Open Browser</source> <translation type="unfinished">Ouverture du navigateur</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6103"/> + <location filename="../UI/UserInterface.py" line="6110"/> <source>Could not start a web browser</source> <translation type="unfinished">Impossible de lancer le navigateur web</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4090"/> + <location filename="../UI/UserInterface.py" line="4097"/> <source>Configure Tool Groups ...</source> <translation>Configuration des groupes d'outils...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4094"/> + <location filename="../UI/UserInterface.py" line="4101"/> <source>Configure current Tool Group ...</source> <translation>Configuration du groupe d'outils courant...</translation> </message> @@ -78899,17 +78919,17 @@ <translation>Afficher les &outils externes</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7080"/> + <location filename="../UI/UserInterface.py" line="7087"/> <source>&Cancel</source> <translation>&Annuler</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7264"/> + <location filename="../UI/UserInterface.py" line="7271"/> <source>Could not perform updates check.</source> <translation>Impossible de vérifier les mises à jour.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7339"/> + <location filename="../UI/UserInterface.py" line="7346"/> <source>First time usage</source> <translation>Première utilisation</translation> </message> @@ -78924,7 +78944,7 @@ <translation>P&lugins</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3282"/> + <location filename="../UI/UserInterface.py" line="3289"/> <source>Plugins</source> <translation>Plugins</translation> </message> @@ -78949,7 +78969,7 @@ <translation>Infos &Plugins...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4062"/> + <location filename="../UI/UserInterface.py" line="4069"/> <source>&Plugin Tools</source> <translation>Outils &plugins</translation> </message> @@ -78979,12 +78999,12 @@ <translation>As&sistants</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4210"/> + <location filename="../UI/UserInterface.py" line="4217"/> <source>&Show all</source> <translation>Tout &afficher</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4212"/> + <location filename="../UI/UserInterface.py" line="4219"/> <source>&Hide all</source> <translation>Tout &masquer</translation> </message> @@ -79004,7 +79024,7 @@ <translation>Affiche les versions disponibles pour le téléchargement</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7288"/> + <location filename="../UI/UserInterface.py" line="7295"/> <source><h3>Available versions</h3><table></source> <translation><h3>Versions disponibles</h3><table></translation> </message> @@ -79094,27 +79114,27 @@ <translation>Gestionnaire de &multi-projet</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5371"/> + <location filename="../UI/UserInterface.py" line="5378"/> <source>External Tools</source> <translation>Outils externes</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6631"/> + <location filename="../UI/UserInterface.py" line="6638"/> <source>Save session</source> <translation>Enregistrer la session</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6615"/> + <location filename="../UI/UserInterface.py" line="6622"/> <source>Read session</source> <translation>Chargement de session</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3454"/> + <location filename="../UI/UserInterface.py" line="3461"/> <source><p>This part of the status bar displays the current editors encoding.</p></source> <translation><p>Cette partie de la barre d'état affiche l'encodage des éditeurs.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3468"/> + <location filename="../UI/UserInterface.py" line="3475"/> <source><p>This part of the status bar displays an indication of the current editors files writability.</p></source> <translation><p>Cette partie de la barre d'état affiche les droits d'écriture des fichiers en cours.</p></translation> </message> @@ -79139,17 +79159,17 @@ <translation><b>Demande d'amélioration...</b><p>Ouvre une fenêtre permettant d'envoyer une demande d'amélioration.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3447"/> + <location filename="../UI/UserInterface.py" line="3454"/> <source><p>This part of the status bar displays the current editors language.</p></source> <translation><p>Cette zone de la barre d'état affiche le langage de l'éditeur actif.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3475"/> - <source><p>This part of the status bar displays the line number of the current editor.</p></source> - <translation><p>Cette zone de la barre d'état affiche le numéro de ligne de l'éditeur actif.</p></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="3482"/> + <source><p>This part of the status bar displays the line number of the current editor.</p></source> + <translation><p>Cette zone de la barre d'état affiche le numéro de ligne de l'éditeur actif.</p></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="3489"/> <source><p>This part of the status bar displays the cursor position of the current editor.</p></source> <translation><p>Cette zone de la barre d'état affiche la position du curseur.</p></translation> </message> @@ -79179,12 +79199,12 @@ <translation><b>Afficher/Masquer la barre d'outils horizontale</b><p>Affiche ou masque la barre d'outils horizontale, selon.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4009"/> + <location filename="../UI/UserInterface.py" line="4016"/> <source>Restart application</source> <translation>Redémarrage de l'application</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4009"/> + <location filename="../UI/UserInterface.py" line="4016"/> <source>The application needs to be restarted. Do it now?</source> <translation>L'application a bersoin d'être relancée. Relancer maintenant ?</translation> </message> @@ -79194,7 +79214,7 @@ <translation>Configuration...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3461"/> + <location filename="../UI/UserInterface.py" line="3468"/> <source><p>This part of the status bar displays the current editors eol setting.</p></source> <translation><p>Cette zone de la barre d'état affiche le type de fin de lignes utilisé pour les éditeurs.</p></translation> </message> @@ -79334,7 +79354,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5058"/> + <location filename="../UI/UserInterface.py" line="5065"/> <source>Qt 3 support</source> <translation type="unfinished"></translation> </message> @@ -79369,109 +79389,109 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3558"/> + <location filename="../UI/UserInterface.py" line="3565"/> <source>External Tools/{0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5237"/> + <location filename="../UI/UserInterface.py" line="5244"/> <source><p>The file <b>{0}</b> does not exist or is zero length.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4961"/> + <location filename="../UI/UserInterface.py" line="4968"/> <source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5030"/> + <location filename="../UI/UserInterface.py" line="5037"/> <source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5083"/> + <location filename="../UI/UserInterface.py" line="5090"/> <source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5125"/> + <location filename="../UI/UserInterface.py" line="5132"/> <source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5193"/> + <location filename="../UI/UserInterface.py" line="5200"/> <source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5248"/> + <location filename="../UI/UserInterface.py" line="5255"/> <source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5269"/> + <location filename="../UI/UserInterface.py" line="5276"/> <source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5362"/> + <location filename="../UI/UserInterface.py" line="5369"/> <source>No tool entry found for external tool '{0}' in tool group '{1}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5371"/> + <location filename="../UI/UserInterface.py" line="5378"/> <source>No toolgroup entry '{0}' found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5410"/> + <location filename="../UI/UserInterface.py" line="5417"/> <source>Starting process '{0} {1}'. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5426"/> + <location filename="../UI/UserInterface.py" line="5433"/> <source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5502"/> + <location filename="../UI/UserInterface.py" line="5509"/> <source>Process '{0}' has exited. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5901"/> + <location filename="../UI/UserInterface.py" line="5908"/> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6506"/> + <location filename="../UI/UserInterface.py" line="6513"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6535"/> + <location filename="../UI/UserInterface.py" line="6542"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6569"/> + <location filename="../UI/UserInterface.py" line="6576"/> <source><p>The session file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6615"/> + <location filename="../UI/UserInterface.py" line="6622"/> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6902"/> <source><p><b>{0}</b> is not a file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7089"/> + <location filename="../UI/UserInterface.py" line="7096"/> <source>Trying host {0}</source> <translation type="unfinished"></translation> </message> @@ -79506,7 +79526,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6337"/> + <location filename="../UI/UserInterface.py" line="6344"/> <source>Keyboard shortcut file (*.e4k)</source> <translation type="unfinished"></translation> </message> @@ -79546,17 +79566,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7153"/> + <location filename="../UI/UserInterface.py" line="7160"/> <source>Error getting versions information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7146"/> - <source>The versions information could not be downloaded. Please go online and try again.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7153"/> + <source>The versions information could not be downloaded. Please go online and try again.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7160"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -79642,12 +79662,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5339"/> + <location filename="../UI/UserInterface.py" line="5346"/> <source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7358"/> + <location filename="../UI/UserInterface.py" line="7365"/> <source>Select Workspace Directory</source> <translation type="unfinished"></translation> </message> @@ -80012,7 +80032,7 @@ <translation type="unfinished">Lance la documentation PyQt4 {5 ?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5771"/> + <location filename="../UI/UserInterface.py" line="5778"/> <source><p>The PyQt5 documentation starting point has not been configured.</p></source> <translation type="unfinished"><p>L'emplacement de la documentation PyQt4 n'a pas été configuré.</p> {5 ?}</translation> </message> @@ -80022,7 +80042,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7080"/> + <location filename="../UI/UserInterface.py" line="7087"/> <source>%v/%m</source> <translation type="unfinished"></translation> </message> @@ -80042,7 +80062,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7084"/> + <location filename="../UI/UserInterface.py" line="7091"/> <source>Version Check</source> <translation type="unfinished"></translation> </message> @@ -80112,27 +80132,27 @@ <translation type="unfinished"><b>Documentation de l'API Eric</b><p>Affiche la do. The location for the documentation is the Documentation/Source subdirectory of the eric4 installation directory.</p> {5 ?} {6 ?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5058"/> + <location filename="../UI/UserInterface.py" line="5065"/> <source>Qt v.3 is not supported by eric6.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7245"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7257"/> + <location filename="../UI/UserInterface.py" line="7264"/> <source>Eric6 is up to date</source> <translation type="unfinished">Eric4 est à jour {5 ?} {6 ?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7257"/> + <location filename="../UI/UserInterface.py" line="7264"/> <source>You are using the latest version of eric6</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7339"/> + <location filename="../UI/UserInterface.py" line="7346"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished">eric4 n'a pas encore été configuré. La fenêtre de configuration va être ouverte. {5 ?} {6 ?}</translation> </message> @@ -80142,17 +80162,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4065"/> + <location filename="../UI/UserInterface.py" line="4072"/> <source>&User Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4137"/> + <location filename="../UI/UserInterface.py" line="4144"/> <source>No User Tools Configured</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7100"/> + <location filename="../UI/UserInterface.py" line="7107"/> <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -80197,7 +80217,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6653"/> + <location filename="../UI/UserInterface.py" line="6660"/> <source>Load session</source> <translation type="unfinished">Charger la session</translation> </message> @@ -80212,17 +80232,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6653"/> + <location filename="../UI/UserInterface.py" line="6660"/> <source>eric6 Session Files (*.e5s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6700"/> + <location filename="../UI/UserInterface.py" line="6707"/> <source>Crash Session found!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6700"/> + <location filename="../UI/UserInterface.py" line="6707"/> <source>A session file of a crashed session was found. Shall this session be restored?</source> <translation type="unfinished"></translation> </message> @@ -80237,17 +80257,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7233"/> + <location filename="../UI/UserInterface.py" line="7240"/> <source>Update Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7233"/> + <location filename="../UI/UserInterface.py" line="7240"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7223"/> + <location filename="../UI/UserInterface.py" line="7230"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation type="unfinished"></translation> </message> @@ -80302,7 +80322,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5884"/> + <location filename="../UI/UserInterface.py" line="5891"/> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> @@ -80337,22 +80357,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3128"/> + <location filename="../UI/UserInterface.py" line="3135"/> <source>Left Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3144"/> + <location filename="../UI/UserInterface.py" line="3151"/> <source>Bottom Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3155"/> + <location filename="../UI/UserInterface.py" line="3162"/> <source>Right Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3179"/> + <location filename="../UI/UserInterface.py" line="3186"/> <source>Plug-ins</source> <translation type="unfinished"></translation> </message> @@ -80378,17 +80398,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6058"/> + <location filename="../UI/UserInterface.py" line="6065"/> <source>Start Web Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6000"/> + <location filename="../UI/UserInterface.py" line="6007"/> <source>The eric6 web browser could not be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6058"/> + <location filename="../UI/UserInterface.py" line="6065"/> <source><p>The eric6 web browser is not started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -80403,7 +80423,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3493"/> + <location filename="../UI/UserInterface.py" line="3500"/> <source><p>This part of the status bar allows zooming the current editor or shell.</p></source> <translation type="unfinished"></translation> </message> @@ -80477,6 +80497,11 @@ <source><b>MicroPython</b><p>This switches the input focus to the MicroPython window.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../UI/UserInterface.py" line="3128"/> + <source>Central Park</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name> @@ -90426,24 +90451,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1427"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Modifications</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Étiquettes</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <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="1436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1447"/> <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> @@ -90452,23 +90477,23 @@ <tr><td><b>Heure de soumission</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Suggestion</b></td><td></td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Modifications</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Parents</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <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> @@ -90479,12 +90504,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Signets</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1481"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -90495,13 +90520,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/eric6/i18n/eric6_it.ts Fri Aug 23 13:23:22 2019 +0200 +++ b/eric6/i18n/eric6_it.ts Fri Aug 23 13:23:36 2019 +0200 @@ -6954,7 +6954,7 @@ <message> <location filename="../Debugger/DebugUI.py" line="597"/> <source>&Start</source> - <translation>&Avvia</translation> + <translation type="obsolete">&Avvia</translation> </message> <message> <location filename="../Debugger/DebugUI.py" line="642"/> @@ -7144,6 +7144,11 @@ <source>No locals available.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Debugger/DebugUI.py" line="597"/> + <source>Sta&rt</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DebugViewer</name> @@ -31283,7 +31288,7 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> <source>The hg process did not finish within 30s.</source> <translation>Il processo hg non è finito entro i 30s.</translation> </message> @@ -31313,420 +31318,420 @@ <translation>Clonazione del progetto dal repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="630"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizzazione con il repository Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="691"/> <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="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="760"/> <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="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/> <source>Renaming {0}</source> <translation>Rinomino {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/> <source>Reverting changes</source> <translation>Annullamento modifiche</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1061"/> <source>Merging</source> <translation>Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1361"/> <source>Mercurial command</source> <translation>Comando Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936"/> <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="1983"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <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="2194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/> <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="2341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> <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="2366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2377"/> <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="2390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2401"/> <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="2414"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2656"/> <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="2223"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2687"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2608"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <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="2737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/> <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="2533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2544"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2647"/> <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="2791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2802"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2782"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2550"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <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="2818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2829"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2822"/> <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="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="555"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3426"/> <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="3523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2897"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2938"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2949"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2996"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3052"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3101"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3292"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> <source>Remove Sub-repositories</source> <translation type="unfinished">Rimuovi sotto-archivi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3280"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="984"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="995"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3156"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Il file <b>{0}</b> non può essere letto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1787"/> <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/hg.py" line="943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="954"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3689"/> <source>Mercurial Bookmark</source> <translation type="unfinished">Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/> <source>Delete Bookmark</source> <translation type="unfinished">Cancella segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished">Seleziona il segnalibro da cancellare:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished">Cancella Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3755"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished">Rinomina Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3797"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished">Sposta Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/> <source>Pull Bookmark</source> <translation type="unfinished">Estrai Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished">Seleziona il segnalibro da estrarre:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3903"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished">Etrae segnalibro da un repository Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/> <source>Push Bookmark</source> <translation type="unfinished">Inserisce Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/> <source>Select the bookmark to be push:</source> <translation type="unfinished">Seleziona il segnalibro da inserire:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3947"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished">Inserisce segnalibro in un repository Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1098"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/> - <source>Canceling uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3113"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3126"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <source>Aborting uncommitted merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -35468,432 +35473,432 @@ <translation><b>Merge</b><p>Fonde le modifiche della revisione nel progetto locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>Tag in repository</source> <translation>Tag nel repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>&Tag in repository...</source> <translation>&Tag nel repository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> - <source>Tag the local project in the repository</source> - <translation>Tag del progetto locale nel repository</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Tag nel repository</b><p>Tag del progetto locale nel repository.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> - <source>List tags</source> - <translation>Elenca tag</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> - <source>List tags...</source> - <translation>Elenca tag...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> - <source>List tags of the project</source> - <translation>Elenca i tag del progetto</translation> + <source>Tag the local project in the repository</source> + <translation>Tag del progetto locale nel repository</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>Elenca tag</b><p>Elenca i tag del progetto.</p></translation> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Tag nel repository</b><p>Tag del progetto locale nel repository.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>List branches</source> - <translation>Elenca branches</translation> + <source>List tags</source> + <translation>Elenca tag</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>List branches...</source> - <translation>Elenca branches...</translation> + <source>List tags...</source> + <translation>Elenca tag...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/> - <source>List branches of the project</source> - <translation>Elenca i branches del progetto</translation> + <source>List tags of the project</source> + <translation>Elenca i tag del progetto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Elenca branches</b><p>Elenca i branch del progetto.</p></translation> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Elenca tag</b><p>Elenca i tag del progetto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> - <source>Create branch</source> - <translation>Crea Branch</translation> + <source>List branches</source> + <translation>Elenca branches</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <source>List branches...</source> + <translation>Elenca branches...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> + <source>List branches of the project</source> + <translation>Elenca i branches del progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Elenca branches</b><p>Elenca i branch del progetto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> + <source>Create branch</source> + <translation>Crea Branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Create &branch...</source> <translation>Crea &Branch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/> <source>Create a new branch for the local project in the repository</source> <translation>Crea un nuovo branch per il progetto locale nel repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Crea Branch</b><p>Crea un nuovo branch per il progetto locate nel repository.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> <source>Close branch</source> <translation>Chiudi branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> <source>Close the current branch of the local project</source> <translation>Chiudi il branch corrente del progetto locale</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Chiudi branch</b><p>Chiude il branch corrente del progetto locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source>Switch</source> <translation>Switch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source>S&witch...</source> <translation>S&witch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source>Switch the working directory to another revision</source> <translation>Switch della directory di lavoro ad un'altra revisione</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Switch</b><p>Switch della directory di lavoro ad un'altra revisione.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> - <source>Cleanup</source> - <translation>Pulisci</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> - <source>Cleanu&p</source> - <translation>&Pulisci</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source>Cleanup the local project</source> - <translation>Pulisci il progetto locale</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Pulizia</b><p>Esegue la pulizia del progetto locale.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source>Execute command</source> - <translation>Esegui comando</translation> + <source>Cleanup</source> + <translation>Pulisci</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source>E&xecute command...</source> - <translation>&Esegui comando...</translation> + <source>Cleanu&p</source> + <translation>&Pulisci</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> - <source>Execute an arbitrary Mercurial command</source> - <translation>Esegui un comando Mercurial arbitrario</translation> + <source>Cleanup the local project</source> + <translation>Pulisci il progetto locale</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Pulizia</b><p>Esegue la pulizia del progetto locale.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source>Execute command</source> + <translation>Esegui comando</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source>E&xecute command...</source> + <translation>&Esegui comando...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> + <source>Execute an arbitrary Mercurial command</source> + <translation>Esegui un comando Mercurial arbitrario</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Esegui comando</b><p>Apre un dialogo per inserire un comando Mercurial arbitraio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source>Configure</source> <translation>Configura</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source>Configure...</source> <translation>Configura...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Mostra il dialogo di configurazione con la pagina di Mercurial selezionata</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Configura</b><p>Mostra il dialogo di configurazione con la pagina di Mercurial selezionata.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> - <source>Show paths</source> - <translation>Mostra percorsi</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> - <source>Show paths...</source> - <translation>Mostra percorsi...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> - <source>Show the aliases for remote repositories</source> - <translation>Mostra alias per i repository remoti</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation><b>Mostra percorsi</b><p>Mostra alias per i repository remoti.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> - <source>Verify repository</source> - <translation>Verifica repository</translation> + <source>Show paths</source> + <translation>Mostra percorsi</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> - <source>Verify repository...</source> - <translation>Verifica repository...</translation> + <source>Show paths...</source> + <translation>Mostra percorsi...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> - <source>Verify the integrity of the repository</source> - <translation>Verifica l'integrità del repository</translation> + <source>Show the aliases for remote repositories</source> + <translation>Mostra alias per i repository remoti</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> - <translation><b>Verifica repository</b><p>Verifica l'integrità del repository.</p></translation> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation><b>Mostra percorsi</b><p>Mostra alias per i repository remoti.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Recover</source> - <translation>Recover</translation> + <source>Verify repository</source> + <translation>Verifica repository</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Recover...</source> - <translation>Recover...</translation> + <source>Verify repository...</source> + <translation>Verifica repository...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> - <source>Recover from an interrupted transaction</source> - <translation>Recupera da una transazione interrotta</translation> + <source>Verify the integrity of the repository</source> + <translation>Verifica l'integrità del repository</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation><b>Verifica repository</b><p>Verifica l'integrità del repository.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <source>Recover</source> + <translation>Recover</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <source>Recover...</source> + <translation>Recover...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <source>Recover from an interrupted transaction</source> + <translation>Recupera da una transazione interrotta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Recover</b><p>Recupera da una transazione interrotta.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> - <source>Create .hgignore</source> - <translation>Crea .hgignore</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> - <source>Create a .hgignore file with default values</source> - <translation>Crea una file .hgignore con i valori di default</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation><b>Crea .hgignore</b><p>Crea una file .hgignore con i valori di default.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> - <source>Create changegroup</source> - <translation>Crea changegroup</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <source>Create .hgignore</source> + <translation>Crea .hgignore</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> + <source>Create a .hgignore file with default values</source> + <translation>Crea una file .hgignore con i valori di default</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation><b>Crea .hgignore</b><p>Crea una file .hgignore con i valori di default.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/> + <source>Create changegroup</source> + <translation>Crea changegroup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/> <source>Create changegroup...</source> <translation>Crea changegroup...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source>Create changegroup file collecting changesets</source> <translation>Crea un file changegroup che colleziona i changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1863"/> <source>Apply changegroups</source> <translation>Applica changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824"/> <source>Apply changegroups...</source> <translation>Applica changegroups...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source>Apply one or several changegroup files</source> <translation>Applica una o più file changegroups</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1362"/> <source>Changegroup Management</source> <translation>Changegroup Management</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Crea changegroup</b><p>Crea un file changegroup che colleziona i changeset (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Applica changegroups</b><p>Applica una o più file changegroups generati dall'azione Create changegroup' action (hg unbundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <source>Show current branch</source> <translation>Mostra branch corrente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source>Show the current branch of the project</source> <translation>Mostra il brach corrente del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Mostra il branch corrente</b><p>Mostra il branch corrente del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Mark as "good"</source> - <translation>Segna come "good"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="830"/> - <source>Mark a selectable changeset as good</source> - <translation>Segna un chageset selezionabile come good</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation><b>Segna come "good"</b><p>Segna un chageset selezionabile come good.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> - <source>Mark as "bad"</source> - <translation>Segna come "bad"</translation> + <source>Mark as "good"</source> + <translation>Segna come "good"</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> - <source>Mark a selectable changeset as bad</source> - <translation>Segna un chageset selezionabile come bad</translation> + <source>Mark a selectable changeset as good</source> + <translation>Segna un chageset selezionabile come good</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> - <translation><b>Segna come bad</b><p>Segna un chageset selezionabile come bad.</p></translation> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation><b>Segna come "good"</b><p>Segna un chageset selezionabile come good.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> - <source>Skip</source> - <translation>Salta</translation> + <source>Mark as "bad"</source> + <translation>Segna come "bad"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> + <source>Mark a selectable changeset as bad</source> + <translation>Segna un chageset selezionabile come bad</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation><b>Segna come bad</b><p>Segna un chageset selezionabile come bad.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <source>Skip</source> + <translation>Salta</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> <source>Reset</source> <translation>Resetta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> <source>Reset the bisect search data</source> <translation>Reset dei dati di ricerca bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Reset</b><p>Reset dei dati di ricerca bisect.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1375"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Mark as "good"...</source> - <translation>Segna come "good"...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> + <source>Mark as "good"...</source> + <translation>Segna come "good"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> <source>Mark as "bad"...</source> <translation>Segna come "bad"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Preview changegroup...</source> <translation>Anteprima changegroup...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source>Identify</source> <translation>Identify</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source>Identify...</source> <translation>Identify...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source>Identify the project directory</source> <translation>Identifica la directory del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identify</b><p>Identifica la directory del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Anteprima di un file changegroup contenente una collezione di changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Anteprima changegroup</b><p>Anteprima di un file changegroup contenente una collezione di changeset.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source>Back out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Back out changes of an earlier changeset</source> <translation>Ritiro changeset di un changeset precedente</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation></b>Ritiro changeset</b><p>Ritiro changeset di un changeset precedente.</p></translation> </message> @@ -35913,312 +35918,312 @@ <translation><b>Push modifiche (force)</b><p>Esegue il push delle modifche dal repository locale verso uno remoto usando l'opzione 'force'.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source>Serve project repository</source> <translation>Servi repository del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source>Serve project repository...</source> <translation>Servi repository del progetto...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> <source>Serve the project repository</source> <translation>Servi il repository del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Servi repository del progetto</b><p>Rende disponibile il repository del progetto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/> <source>Specials</source> <translation>Speciali</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1674"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/> <source>The project should be reread. Do this now?</source> <translation>Il progetto deve essere riletto. Farlo ora ?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1420"/> <source>Extensions</source> <translation type="unfinished">Estensioni</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> - <source>Edit user configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Show an editor to edit the user configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> - <source>Edit repository configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> - <source>Edit repository configuration...</source> + <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> - <source>Show an editor to edit the repository configuration file</source> + <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <source>Show an editor to edit the repository configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1919"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1939"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> - <source>Export revisions to patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="961"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source>Change Phase...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> - <source>Change the phase of revisions</source> + <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <source>Change Phase...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="989"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1959"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1020"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1974"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Add</source> <translation type="unfinished">Aggiungi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Add...</source> <translation type="unfinished">Aggiungi...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Remove</source> <translation type="unfinished">Rimuovi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1080"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1424"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -36248,32 +36253,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="917"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1328"/> <source>Administration</source> <translation type="unfinished"></translation> </message> @@ -36298,338 +36303,353 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> + <source>List bookmarks</source> + <translation type="unfinished">Lista i segnalibri</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> + <source>List bookmarks...</source> + <translation type="unfinished">Lista i segnalibri...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/> + <source>List bookmarks of the project</source> + <translation type="unfinished">Lista i segnalibri del progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1112"/> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation type="unfinished"><b>Lista i segnalibri</b><p>Lista i segnalibri del progetto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> + <source>Define bookmark</source> + <translation type="unfinished">Definisci un segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> + <source>Define bookmark...</source> + <translation type="unfinished">Definisci un segnalibro...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/> + <source>Define a bookmark for the project</source> + <translation type="unfinished">Definisci un segnalibro per il progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1127"/> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <translation type="unfinished"><b>Definisci un segnalibro</b><p>Definisci un segnalibro per il progetto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> + <source>Delete bookmark</source> + <translation type="unfinished">Cancella segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> + <source>Delete bookmark...</source> + <translation type="unfinished">Cancella segnalibro...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/> + <source>Delete a bookmark of the project</source> + <translation type="unfinished">Cancella un segnalibro del progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142"/> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation type="unfinished"><b>Cancella segnalibro</b><p>Cancella un segnalibro del progetto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> + <source>Rename bookmark</source> + <translation type="unfinished">Rinomina segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> + <source>Rename bookmark...</source> + <translation type="unfinished">Rinomina segnalibro...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> + <source>Rename a bookmark of the project</source> + <translation type="unfinished">Rinomina un segnalibro del progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1157"/> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation type="unfinished"><b>Rinomina segnalibro</b><p>Rinomina un segnalibro del progetto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> + <source>Move bookmark</source> + <translation type="unfinished">Sposta segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> + <source>Move bookmark...</source> + <translation type="unfinished">Sposta segnalibro...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> + <source>Move a bookmark of the project</source> + <translation type="unfinished">Sposta un segnalibro del progetto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1172"/> + <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> + <translation type="unfinished"><b>Sposta segnalibro</b><p>Sposta un segnalibro del progetto ad un altro insieme di modifiche.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1180"/> + <source>Show incoming bookmarks</source> + <translation type="unfinished">Mostra i segnalibri entranti</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> + <source>Show a list of incoming bookmarks</source> + <translation type="unfinished">Mostra una lista dei segnalibri entranti</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1188"/> + <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> + <translation type="unfinished"><b>Mostra segnalibri entranti</b><p>Mostra una lista di nuovi segnalibri disponibili nel repository remoto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> + <source>Pull bookmark</source> + <translation type="unfinished">Estrae segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> + <source>Pull a bookmark from a remote repository</source> + <translation type="unfinished">Estrae un segnalibro da un repository remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1205"/> + <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> + <translation type="unfinished"><b>Estrae segnalibri</b><p>Estrae un segnalibro da un repository remoto a quello locale.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1229"/> + <source>Show outgoing bookmarks</source> + <translation type="unfinished">Mostra segnalibri uscenti</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> + <source>Show a list of outgoing bookmarks</source> + <translation type="unfinished">Mostra una lista di segnalibri uscenti</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1237"/> + <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> + <translation type="unfinished"><b>Mostra segnalibri in uscita</b><p>Mostra una lista di nuovi segnalibri disponibili nel repository locale.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1246"/> + <source>Push bookmark</source> + <translation type="unfinished">Inserisci segnalibro</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> + <source>Push a bookmark to a remote repository</source> + <translation type="unfinished">Inserisce segnalibro in repository remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1254"/> + <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> + <translation type="unfinished"><b>Inserimento segnalibro</b><p>Inserisce un segnalibro dal repository locale a quello remoto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399"/> + <source>Bookmarks</source> + <translation type="unfinished">Segnalibri</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1383"/> + <source>Tags</source> + <translation type="unfinished">Tags</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390"/> + <source>Branches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> + <source>Re-Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/> + <source>Re-Merge all conflicting, unresolved files of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> + <source>Show conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> + <source>Show conflicts...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> + <source>Show a dialog listing all files with conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> + <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <source>Conflicts unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> + <source>Mark all conflicts of the local project as unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> + <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="459"/> + <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1528"/> + <source>Mercurial</source> + <translation type="unfinished">Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> + <source>Pull current bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> + <source>Pull the current bookmark from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1221"/> + <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1262"/> + <source>Push current bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1267"/> + <source>Push the current bookmark to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1279"/> + <source>Delete all backups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1284"/> + <source>Delete all backup bundles stored in the backup area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1287"/> + <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/> + <source>Stop Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> + <source>Stop the interrupted copying session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <source>Abort Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> + <source>Abort the interrupted copying session and rollback</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> + <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1445"/> + <source>Merge Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1988"/> + <source>Copy Changesets (Stop)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/> + <source>Copy Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> + <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> - <source>Cancel uncommitted merge</source> + <source>Commit Merge</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> - <source>Cancel an uncommitted merge and lose all changes</source> + <source>Commit a merge.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> - <source>List bookmarks</source> - <translation type="unfinished">Lista i segnalibri</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> - <source>List bookmarks...</source> - <translation type="unfinished">Lista i segnalibri...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> - <source>List bookmarks of the project</source> - <translation type="unfinished">Lista i segnalibri del progetto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation type="unfinished"><b>Lista i segnalibri</b><p>Lista i segnalibri del progetto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> - <source>Define bookmark</source> - <translation type="unfinished">Definisci un segnalibro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> - <source>Define bookmark...</source> - <translation type="unfinished">Definisci un segnalibro...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1110"/> - <source>Define a bookmark for the project</source> - <translation type="unfinished">Definisci un segnalibro per il progetto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation type="unfinished"><b>Definisci un segnalibro</b><p>Definisci un segnalibro per il progetto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> - <source>Delete bookmark</source> - <translation type="unfinished">Cancella segnalibro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> - <source>Delete bookmark...</source> - <translation type="unfinished">Cancella segnalibro...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125"/> - <source>Delete a bookmark of the project</source> - <translation type="unfinished">Cancella un segnalibro del progetto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation type="unfinished"><b>Cancella segnalibro</b><p>Cancella un segnalibro del progetto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> - <source>Rename bookmark</source> - <translation type="unfinished">Rinomina segnalibro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> - <source>Rename bookmark...</source> - <translation type="unfinished">Rinomina segnalibro...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1140"/> - <source>Rename a bookmark of the project</source> - <translation type="unfinished">Rinomina un segnalibro del progetto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation type="unfinished"><b>Rinomina segnalibro</b><p>Rinomina un segnalibro del progetto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> - <source>Move bookmark</source> - <translation type="unfinished">Sposta segnalibro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> - <source>Move bookmark...</source> - <translation type="unfinished">Sposta segnalibro...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155"/> - <source>Move a bookmark of the project</source> - <translation type="unfinished">Sposta un segnalibro del progetto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1158"/> - <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> - <translation type="unfinished"><b>Sposta segnalibro</b><p>Sposta un segnalibro del progetto ad un altro insieme di modifiche.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> - <source>Show incoming bookmarks</source> - <translation type="unfinished">Mostra i segnalibri entranti</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/> - <source>Show a list of incoming bookmarks</source> - <translation type="unfinished">Mostra una lista dei segnalibri entranti</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1174"/> - <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> - <translation type="unfinished"><b>Mostra segnalibri entranti</b><p>Mostra una lista di nuovi segnalibri disponibili nel repository remoto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> - <source>Pull bookmark</source> - <translation type="unfinished">Estrae segnalibro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1188"/> - <source>Pull a bookmark from a remote repository</source> - <translation type="unfinished">Estrae un segnalibro da un repository remoto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1191"/> - <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> - <translation type="unfinished"><b>Estrae segnalibri</b><p>Estrae un segnalibro da un repository remoto a quello locale.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> - <source>Show outgoing bookmarks</source> - <translation type="unfinished">Mostra segnalibri uscenti</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/> - <source>Show a list of outgoing bookmarks</source> - <translation type="unfinished">Mostra una lista di segnalibri uscenti</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223"/> - <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> - <translation type="unfinished"><b>Mostra segnalibri in uscita</b><p>Mostra una lista di nuovi segnalibri disponibili nel repository locale.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1232"/> - <source>Push bookmark</source> - <translation type="unfinished">Inserisci segnalibro</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1237"/> - <source>Push a bookmark to a remote repository</source> - <translation type="unfinished">Inserisce segnalibro in repository remoto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1240"/> - <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> - <translation type="unfinished"><b>Inserimento segnalibro</b><p>Inserisce un segnalibro dal repository locale a quello remoto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1383"/> - <source>Bookmarks</source> - <translation type="unfinished">Segnalibri</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> - <source>Tags</source> - <translation type="unfinished">Tags</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1374"/> - <source>Branches</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> - <source>Re-Merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> - <source>Re-Merge all conflicting, unresolved files of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> - <source>Show conflicts</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> - <source>Show conflicts...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> - <source>Show a dialog listing all files with conflicts</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> - <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> - <source>Conflicts unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> - <source>Mark all conflicts of the local project as unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> - <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="445"/> - <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511"/> - <source>Mercurial</source> - <translation type="unfinished">Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> - <source>Pull current bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/> - <source>Pull the current bookmark from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1207"/> - <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> - <source>Push current bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/> - <source>Push the current bookmark to a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> - <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> - <source>Delete all backups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> - <source>Delete all backup bundles stored in the backup area</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1273"/> - <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> - <source>Stop Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1018"/> - <source>Stop the interrupted copying session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/> - <source>Abort Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> - <source>Abort the interrupted copying session and rollback</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> - <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1429"/> - <source>Merge Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1964"/> - <source>Copy Changesets (Stop)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/> - <source>Copy Changesets (Abort)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> + <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <source>Abort Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> + <source>Abort an uncommitted merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443"/> + <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> </context> @@ -47794,202 +47814,202 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="853"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="854"/> <source>Serial Device Connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="853"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="854"/> <source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="898"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="899"/> <source>Run Script</source> <translation type="unfinished">Esegui Script</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="881"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="882"/> <source>There is no editor open. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="889"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="890"/> <source>The current editor does not contain a script. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="898"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="899"/> <source><p>Cannot run script.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="922"/> <source>Open Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="922"/> <source>Python3 Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="965"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="966"/> <source>Start Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="965"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="966"/> <source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="995"/> <source>Unsaved Chart Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="995"/> <source>The chart contains unsaved data.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/> <source>Start File Manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/> <source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1097"/> <source>Show Version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1100"/> <source>Show Implementation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> <source>Synchronize Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1108"/> <source>Show Device Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1111"/> <source>Show Local Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1339"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1361"/> <source>Compile Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1359"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1381"/> <source>Compile Current Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1132"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1135"/> <source><h3>Device Version Information</h3></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1141"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1144"/> <source>No version information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1143"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1146"/> <source>Device Version Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1166"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1169"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/> <source>Device Implementation Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/> <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> <source><p>The time of the connected device was synchronized with the local time.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1216"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1219"/> <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1224"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1227"/> <source><h3>Device Date and Time</h3><p>{0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1238"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1241"/> <source>Device Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/> <source>Local Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/> <source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/> <source>Error handling device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/> <source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1291"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1313"/> <source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1309"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1331"/> <source>Python Files (*.py);;All Files (*)</source> <translation type="unfinished">File Python (*.py);;Tutti i File (*)</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1319"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1341"/> <source>The Python file <b>{0}</b> does not exist. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1329"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1351"/> <source>'mpy-cross' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1352"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> <source>The current editor does not contain a Python file. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -48004,12 +48024,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="978"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="979"/> <source>µPy Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1059"/> <source>µPy Files</source> <translation type="unfinished"></translation> </message> @@ -78323,7 +78343,7 @@ <translation><b>Mostra versioni</b><p>Mostra delle informazioni sulla versione.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3724"/> + <location filename="../UI/UserInterface.py" line="3731"/> <source>Report Bug</source> <translation>Segnala Bug</translation> </message> @@ -78343,7 +78363,7 @@ <translation><b>>Segnala Bug...</b><p>Apre un dialogo per segnalare un bug.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3278"/> + <location filename="../UI/UserInterface.py" line="3285"/> <source>Unittest</source> <translation>Unittest</translation> </message> @@ -78398,7 +78418,7 @@ <translation><b>Scorciatoie da tastiera</b><p>Imposta le scorciatoie da tastiera dell'applicazione con i valori personalizzati.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6313"/> + <location filename="../UI/UserInterface.py" line="6320"/> <source>Export Keyboard Shortcuts</source> <translation>Esporta scorciatoie da tastiera</translation> </message> @@ -78418,7 +78438,7 @@ <translation><b>Esporta scorciatoie da tastiera</b><p>Esporta le scorciatoie da tastiera dell'applicazione.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6337"/> + <location filename="../UI/UserInterface.py" line="6344"/> <source>Import Keyboard Shortcuts</source> <translation>Importa scorciatoie da tastiera</translation> </message> @@ -78448,37 +78468,37 @@ <translation>&Finestre</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3202"/> + <location filename="../UI/UserInterface.py" line="3209"/> <source>&Help</source> <translation>&Help</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3277"/> + <location filename="../UI/UserInterface.py" line="3284"/> <source>Tools</source> <translation>Strumenti</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5111"/> + <location filename="../UI/UserInterface.py" line="5118"/> <source>Help</source> <translation>Aiuto</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3279"/> + <location filename="../UI/UserInterface.py" line="3286"/> <source>Settings</source> <translation>Impostazioni</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3189"/> + <location filename="../UI/UserInterface.py" line="3196"/> <source>&Toolbars</source> <translation>&Toolbar</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5237"/> + <location filename="../UI/UserInterface.py" line="5244"/> <source>Problem</source> <translation>Problema</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5426"/> + <location filename="../UI/UserInterface.py" line="5433"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> @@ -78593,7 +78613,7 @@ <translation type="obsolete">Non c'è uno script principale definito per il progetto. Esco</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6902"/> <source>Drop Error</source> <translation>Errore Drop</translation> </message> @@ -78728,27 +78748,27 @@ <translation>Task-Viewer</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6506"/> + <location filename="../UI/UserInterface.py" line="6513"/> <source>Save tasks</source> <translation>Salva task</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6535"/> + <location filename="../UI/UserInterface.py" line="6542"/> <source>Read tasks</source> <translation>Leggi task</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5111"/> + <location filename="../UI/UserInterface.py" line="5118"/> <source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source> <translation>Attualmente nessun visualizzatore personalizzato è selezionato. Per favore usa il dialogo delle preferenze per specificarne uno.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5901"/> + <location filename="../UI/UserInterface.py" line="5908"/> <source>Documentation Missing</source> <translation>Documentazione mancante</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3724"/> + <location filename="../UI/UserInterface.py" line="3731"/> <source>Email address or mail server address is empty. Please configure your Email settings in the Preferences Dialog.</source> <translation>L'indirizzo di posta o il server si posta sono vuoti. Per cortesia configura le opzioni per l'Email nel dialogo delle preferenze.</translation> </message> @@ -78843,7 +78863,7 @@ <translation>Apri documentazione API di Eric</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5145"/> + <location filename="../UI/UserInterface.py" line="5152"/> <source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source> <translation><p>Non posso avviare il visualizzatore di help.<br>Assicurarsi che sia disponibile come <b>hh</b>.</p></translation> </message> @@ -78914,52 +78934,52 @@ <translation>Impos&tazioni</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3281"/> + <location filename="../UI/UserInterface.py" line="3288"/> <source>Profiles</source> <translation>Profili</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4045"/> + <location filename="../UI/UserInterface.py" line="4052"/> <source>&Builtin Tools</source> <translation>Tool &Builtin</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5884"/> + <location filename="../UI/UserInterface.py" line="5891"/> <source>Documentation</source> <translation>Documentazione</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5709"/> + <location filename="../UI/UserInterface.py" line="5716"/> <source><p>The PyQt4 documentation starting point has not been configured.</p></source> <translation type="unfinished"><p>L'inizio della documentazione di PySide non è stato configurato.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7264"/> + <location filename="../UI/UserInterface.py" line="7271"/> <source>Error during updates check</source> <translation>Errore nel controllo per gli update</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7245"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Update available</source> <translation>Aggiornamento disponibile</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3664"/> + <location filename="../UI/UserInterface.py" line="3671"/> <source><h3>Version Numbers</h3><table></source> <translation><h3>Numeri di versione</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7302"/> + <location filename="../UI/UserInterface.py" line="7309"/> <source></table></source> <translation></table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4090"/> + <location filename="../UI/UserInterface.py" line="4097"/> <source>Configure Tool Groups ...</source> <translation>Configura Tools Groups...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4094"/> + <location filename="../UI/UserInterface.py" line="4101"/> <source>Configure current Tool Group ...</source> <translation>Configura Tools Groups correnti...</translation> </message> @@ -78974,17 +78994,17 @@ <translation>Mostra toll &esterni</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7080"/> + <location filename="../UI/UserInterface.py" line="7087"/> <source>&Cancel</source> <translation>&Cancella</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7264"/> + <location filename="../UI/UserInterface.py" line="7271"/> <source>Could not perform updates check.</source> <translation>Non posso controllare per gli update.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7339"/> + <location filename="../UI/UserInterface.py" line="7346"/> <source>First time usage</source> <translation>Primo avvio</translation> </message> @@ -78999,7 +79019,7 @@ <translation>P&lugins</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3282"/> + <location filename="../UI/UserInterface.py" line="3289"/> <source>Plugins</source> <translation>Plugins</translation> </message> @@ -79024,7 +79044,7 @@ <translation>Informazioni su &Plugin...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4062"/> + <location filename="../UI/UserInterface.py" line="4069"/> <source>&Plugin Tools</source> <translation>Informazioni sui &Plugin Tools</translation> </message> @@ -79054,12 +79074,12 @@ <translation>Wi&zards</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4210"/> + <location filename="../UI/UserInterface.py" line="4217"/> <source>&Show all</source> <translation>Mo&stra tutti</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4212"/> + <location filename="../UI/UserInterface.py" line="4219"/> <source>&Hide all</source> <translation>Nascondi &tutti</translation> </message> @@ -79079,7 +79099,7 @@ <translation>Mostra le versioni disponibili per il download</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7288"/> + <location filename="../UI/UserInterface.py" line="7295"/> <source><h3>Available versions</h3><table></source> <translation><h3>Versioni disponibili</h3><table></translation> </message> @@ -79169,27 +79189,27 @@ <translation>&Multiproject-Viewer</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5371"/> + <location filename="../UI/UserInterface.py" line="5378"/> <source>External Tools</source> <translation>Tool esterni</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6631"/> + <location filename="../UI/UserInterface.py" line="6638"/> <source>Save session</source> <translation>Salva sessione</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6615"/> + <location filename="../UI/UserInterface.py" line="6622"/> <source>Read session</source> <translation>Leggi sessione</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3454"/> + <location filename="../UI/UserInterface.py" line="3461"/> <source><p>This part of the status bar displays the current editors encoding.</p></source> <translation><p>Questa zona della barra di stato mostra l'encoding usato dall'editor.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3468"/> + <location filename="../UI/UserInterface.py" line="3475"/> <source><p>This part of the status bar displays an indication of the current editors files writability.</p></source> <translation><p>Questa zona della barra di stato mostra la possibilità di scrittura del file.</p></translation> </message> @@ -79214,17 +79234,17 @@ <translation><b>Richiedi funzionalità...</b><p>Apre un dialogo per mandare una richiesta di funzionalità.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3447"/> + <location filename="../UI/UserInterface.py" line="3454"/> <source><p>This part of the status bar displays the current editors language.</p></source> <translation><p>Questa zona della barra di stato mostra il linguaggio usato dall'editor.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3475"/> - <source><p>This part of the status bar displays the line number of the current editor.</p></source> - <translation><p>Questa parte della barra di stato mostra il numero di linea.</p></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="3482"/> + <source><p>This part of the status bar displays the line number of the current editor.</p></source> + <translation><p>Questa parte della barra di stato mostra il numero di linea.</p></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="3489"/> <source><p>This part of the status bar displays the cursor position of the current editor.</p></source> <translation><p>Questa parte della barra di stato mostra la posizione del cursore.</p></translation> </message> @@ -79254,12 +79274,12 @@ <translation><b>Abilita/Disabilita la finestra della toolbox orizzontale</b><p>Se la finestra della toolbox orizzontale è nascosta verrà mostrata. Se è mostrata verrà chiusa.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4009"/> + <location filename="../UI/UserInterface.py" line="4016"/> <source>Restart application</source> <translation>Riavvia applicazione</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4009"/> + <location filename="../UI/UserInterface.py" line="4016"/> <source>The application needs to be restarted. Do it now?</source> <translation>L'applicazione necessita di un riavvio. Farlo ora ?</translation> </message> @@ -79269,7 +79289,7 @@ <translation>Configura...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3461"/> + <location filename="../UI/UserInterface.py" line="3468"/> <source><p>This part of the status bar displays the current editors eol setting.</p></source> <translation><p>Questa zona della barra di stato mostra l'eol usato dall'editor.</p></translation> </message> @@ -79409,7 +79429,7 @@ <translation>Editor di &icone...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5058"/> + <location filename="../UI/UserInterface.py" line="5065"/> <source>Qt 3 support</source> <translation>Supporto Qt3</translation> </message> @@ -79444,110 +79464,110 @@ <translation>{0} -{1} - {2} - Passive Debug Mode</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3558"/> + <location filename="../UI/UserInterface.py" line="3565"/> <source>External Tools/{0}</source> <translation>Tool Esterni/{0}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5237"/> + <location filename="../UI/UserInterface.py" line="5244"/> <source><p>The file <b>{0}</b> does not exist or is zero length.</p></source> <translation><p>Il file <b>{0}</b> non esiste o ha lunghezza zero.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4961"/> + <location filename="../UI/UserInterface.py" line="4968"/> <source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Non posso avviare Qt-Designer.<br>Assicurarsi che sia disponibile come <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5030"/> + <location filename="../UI/UserInterface.py" line="5037"/> <source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Non posso avviare Qt-Linguist.<br>Assicurarsi che sia disponibile come <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5083"/> + <location filename="../UI/UserInterface.py" line="5090"/> <source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Non posso avviare Qt-Assistant.<br>Assicurarsi che sia disponibile come <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5125"/> + <location filename="../UI/UserInterface.py" line="5132"/> <source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Non posso avviare il visualizzatore personalizzato.<br>Assicurarsi che sia disponibile come <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5193"/> + <location filename="../UI/UserInterface.py" line="5200"/> <source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Non posso avviare UI Previewer.<br>Assicurarsi che sia disponibile come <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5248"/> + <location filename="../UI/UserInterface.py" line="5255"/> <source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Non posso avviare l'anteprima delle traduzioni.<br>Assicurarsi che sia disponibile come <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5269"/> + <location filename="../UI/UserInterface.py" line="5276"/> <source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Non posso avviare SQL Browser.<br>Assicurarsi che sia disponibile come <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5362"/> + <location filename="../UI/UserInterface.py" line="5369"/> <source>No tool entry found for external tool '{0}' in tool group '{1}'.</source> <translation>Nessun elemento per il tool esterno '{0}' trovato nel gruppo '{1}'.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5371"/> + <location filename="../UI/UserInterface.py" line="5378"/> <source>No toolgroup entry '{0}' found.</source> <translation>Nessun gruppo '{0}' trovato.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5410"/> + <location filename="../UI/UserInterface.py" line="5417"/> <source>Starting process '{0} {1}'. </source> <translation>Avvio processo '{0} {1}'. </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5426"/> + <location filename="../UI/UserInterface.py" line="5433"/> <source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source> <translation><p>Non posso avviare l'elemento degli strumenti <b>{0}</b>.<br>Assicurarsi che sia disponibile come <b>{1}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5502"/> + <location filename="../UI/UserInterface.py" line="5509"/> <source>Process '{0}' has exited. </source> <translation>Il processo '{0}' è terminato.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5901"/> + <location filename="../UI/UserInterface.py" line="5908"/> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation><p>L'inizio della documentazione "<b>{0}</b>" non viene trovato.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6506"/> + <location filename="../UI/UserInterface.py" line="6513"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation><p>Il file task <b>{0}</b> non può essere scritto.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6535"/> + <location filename="../UI/UserInterface.py" line="6542"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation><p>Il file task <b>{0}</b> non può essere letto.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6569"/> + <location filename="../UI/UserInterface.py" line="6576"/> <source><p>The session file <b>{0}</b> could not be written.</p></source> <translation><p>Il file sessione <b>{0}</b> non può essere scritto.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6615"/> + <location filename="../UI/UserInterface.py" line="6622"/> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation><p>Il file sessione <b>{0}</b> non può essere letto.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6902"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> non è un file.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7089"/> + <location filename="../UI/UserInterface.py" line="7096"/> <source>Trying host {0}</source> <translation>Tento su host {0}</translation> </message> @@ -79582,7 +79602,7 @@ <translation>Alt+Shift+B</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6337"/> + <location filename="../UI/UserInterface.py" line="6344"/> <source>Keyboard shortcut file (*.e4k)</source> <translation>File scorciatoi tastiera (*.e4k)</translation> </message> @@ -79622,27 +79642,27 @@ <translation><b>Documentazione Python 2</b><p>Mostra la documentazione Python 2. Se non è configurata una directory per la documentazione, viene assunto che la posizione della documentazione sia nella directory doc nella locazione dell'eseguibile Python 2 su Windows e <i>/usr/share/doc/packages/python/html</i> su Unix. Imposta PYTHONDOCDIR2 nel tuo ambiente per sovrascrivere questi valori.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7153"/> + <location filename="../UI/UserInterface.py" line="7160"/> <source>Error getting versions information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7146"/> - <source>The versions information could not be downloaded. Please go online and try again.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="6103"/> - <source>Open Browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="6103"/> - <source>Could not start a web browser</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7153"/> + <source>The versions information could not be downloaded. Please go online and try again.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="6110"/> + <source>Open Browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="6110"/> + <source>Could not start a web browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7160"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -79728,12 +79748,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5339"/> + <location filename="../UI/UserInterface.py" line="5346"/> <source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7358"/> + <location filename="../UI/UserInterface.py" line="7365"/> <source>Select Workspace Directory</source> <translation type="unfinished">Seleziona cartella di lavoro</translation> </message> @@ -80098,7 +80118,7 @@ <translation type="unfinished">Apri documentazione su PyQt4 {5 ?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5771"/> + <location filename="../UI/UserInterface.py" line="5778"/> <source><p>The PyQt5 documentation starting point has not been configured.</p></source> <translation type="unfinished"><p>L'inizio della documentazione di PyQt4 non è stato configurato.</p> {5 ?}</translation> </message> @@ -80108,7 +80128,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7080"/> + <location filename="../UI/UserInterface.py" line="7087"/> <source>%v/%m</source> <translation type="unfinished"></translation> </message> @@ -80128,7 +80148,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7084"/> + <location filename="../UI/UserInterface.py" line="7091"/> <source>Version Check</source> <translation type="unfinished"></translation> </message> @@ -80198,27 +80218,27 @@ <translation type="unfinished"><b>Documentazione API Eric</b><p>Mostra la documentazione delle API di Eric. La posizione della documentazione è la subdirectory Documentation/Source della directory in cui è installato eric6.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5058"/> + <location filename="../UI/UserInterface.py" line="5065"/> <source>Qt v.3 is not supported by eric6.</source> <translation type="unfinished">Le Qt v.3 non sono supportate da eric6.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7245"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation type="unfinished">L'update alla versione <b>{0}</b> di eric6 è disponibile presso <b>{1}</b>. Vuoi prenderlo?</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7257"/> + <location filename="../UI/UserInterface.py" line="7264"/> <source>Eric6 is up to date</source> <translation type="unfinished">Eric6 è aggiornato</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7257"/> + <location filename="../UI/UserInterface.py" line="7264"/> <source>You are using the latest version of eric6</source> <translation type="unfinished">Stai usando l'ultima versione di eric6</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7339"/> + <location filename="../UI/UserInterface.py" line="7346"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished">eric6 non è ancora stato configurato. Il dialogo di configurazione verrà avviato.</translation> </message> @@ -80228,17 +80248,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4065"/> + <location filename="../UI/UserInterface.py" line="4072"/> <source>&User Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4137"/> + <location filename="../UI/UserInterface.py" line="4144"/> <source>No User Tools Configured</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7100"/> + <location filename="../UI/UserInterface.py" line="7107"/> <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -80283,7 +80303,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6653"/> + <location filename="../UI/UserInterface.py" line="6660"/> <source>Load session</source> <translation type="unfinished">Carica sessione</translation> </message> @@ -80298,17 +80318,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6653"/> + <location filename="../UI/UserInterface.py" line="6660"/> <source>eric6 Session Files (*.e5s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6700"/> + <location filename="../UI/UserInterface.py" line="6707"/> <source>Crash Session found!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6700"/> + <location filename="../UI/UserInterface.py" line="6707"/> <source>A session file of a crashed session was found. Shall this session be restored?</source> <translation type="unfinished"></translation> </message> @@ -80323,17 +80343,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7233"/> + <location filename="../UI/UserInterface.py" line="7240"/> <source>Update Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7233"/> + <location filename="../UI/UserInterface.py" line="7240"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7223"/> + <location filename="../UI/UserInterface.py" line="7230"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation type="unfinished"></translation> </message> @@ -80388,7 +80408,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5884"/> + <location filename="../UI/UserInterface.py" line="5891"/> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> @@ -80423,22 +80443,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3128"/> + <location filename="../UI/UserInterface.py" line="3135"/> <source>Left Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3144"/> + <location filename="../UI/UserInterface.py" line="3151"/> <source>Bottom Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3155"/> + <location filename="../UI/UserInterface.py" line="3162"/> <source>Right Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3179"/> + <location filename="../UI/UserInterface.py" line="3186"/> <source>Plug-ins</source> <translation type="unfinished"></translation> </message> @@ -80464,17 +80484,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6058"/> + <location filename="../UI/UserInterface.py" line="6065"/> <source>Start Web Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6000"/> + <location filename="../UI/UserInterface.py" line="6007"/> <source>The eric6 web browser could not be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6058"/> + <location filename="../UI/UserInterface.py" line="6065"/> <source><p>The eric6 web browser is not started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -80489,7 +80509,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3493"/> + <location filename="../UI/UserInterface.py" line="3500"/> <source><p>This part of the status bar allows zooming the current editor or shell.</p></source> <translation type="unfinished"></translation> </message> @@ -80563,6 +80583,11 @@ <source><b>MicroPython</b><p>This switches the input focus to the MicroPython window.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../UI/UserInterface.py" line="3128"/> + <source>Central Park</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name> @@ -90512,24 +90537,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1427"/> <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="2056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <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="2066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <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="1436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1447"/> <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> @@ -90538,24 +90563,24 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/> <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="2051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <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="2075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <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> @@ -90565,12 +90590,12 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Segnalibri</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1481"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -90587,13 +90612,13 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/eric6/i18n/eric6_pt.ts Fri Aug 23 13:23:22 2019 +0200 +++ b/eric6/i18n/eric6_pt.ts Fri Aug 23 13:23:36 2019 +0200 @@ -6938,7 +6938,7 @@ <message> <location filename="../Debugger/DebugUI.py" line="597"/> <source>&Start</source> - <translation>&Iniciar</translation> + <translation type="obsolete">&Iniciar</translation> </message> <message> <location filename="../Debugger/DebugUI.py" line="599"/> @@ -7146,6 +7146,11 @@ <source>No locals available.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Debugger/DebugUI.py" line="597"/> + <source>Sta&rt</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DebugViewer</name> @@ -31275,7 +31280,7 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> <source>The hg process did not finish within 30s.</source> <translation>O processo hg não acabou em 30s.</translation> </message> @@ -31305,420 +31310,420 @@ <translation>A clonar projeto dum repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="630"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> <source>Synchronizing with the Mercurial repository</source> <translation>A sincronizar com o repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="691"/> <source>Adding files/directories to the Mercurial repository</source> <translation>A adicionar ficheiros/diretorios ao repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="760"/> <source>Removing files/directories from the Mercurial repository</source> <translation>A retirar ficheiros/diretorios do repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/> <source>Renaming {0}</source> <translation>A renomear {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/> <source>Reverting changes</source> <translation>Desfazer alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1061"/> <source>Merging</source> <translation>A mesclar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1361"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/> <source>Copying {0}</source> <translation>A copiar {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936"/> <source>Pulling from a remote Mercurial repository</source> <translation>A puxar dum repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1983"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <source>Pushing to a remote Mercurial repository</source> <translation>A empurrar a um repositorio Mercurial remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/> <source>Creating branch in the Mercurial repository</source> <translation>A criar ramo no repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2223"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/> <source>Showing current branch</source> <translation>A mostrar o ramo atual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>A verificar a integridade do repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2377"/> <source>Showing the combined configuration settings</source> <translation>A mostrar as definições de configuração combinadas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2401"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2414"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Recovering from interrupted transaction</source> <translation>A recuperar duma transação interrompida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/> <source>Identifying project directory</source> <translation>A identificar o diretorio do projeto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <source>Create .hgignore file</source> <translation>Criar ficheiro .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>O ficheiro <b>{0}</b> já existe. Sobreescrever?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587"/> <source>Create changegroup</source> <translation>Criar conjunto de alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2544"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2550"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <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="2597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2608"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2647"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2656"/> <source>Shall the working directory be updated?</source> <translation>O diretorio de trabalho deve ser atualizado?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2687"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/> <source>Removing files from the Mercurial repository only</source> <translation>A retirar ficheiros apenas do repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2802"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2782"/> <source>No revision given. Aborting...</source> <translation>Não foi dada revisão. Terminando...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2829"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2822"/> <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="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="555"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3426"/> <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="3523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2897"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2938"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2949"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2996"/> <source>Change Phase</source> <translation>Mudar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3052"/> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3101"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3292"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> <source>Remove Sub-repositories</source> <translation>Retirar Sub Repositórios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3280"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> <source>Commit Changes</source> <translation>Aplicar Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> <source>Revert changes</source> <translation>Desfazer alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="984"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="995"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3156"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> <source>Mercurial Side-by-Side Difference</source> <translation>Diferenças lado a lado de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>O ficheiro <b>{0}</b> não se pôde ler.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1787"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Não pôde iniciar {0}.<br>Certifique-se de que está na rota de pesquisa.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="954"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/> <source>Re-Merge</source> <translation>Remesclar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1098"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> <source>Current branch tip</source> <translation>Dica de ramo atual</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <source>Marking as 'unresolved'</source> <translation>A marcar como 'sem resolver'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> <source>Marking as 'resolved'</source> <translation>A marcar como 'resolvido'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Created new branch <{0}>.</source> <translation>Criado o novo ramo <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3689"/> <source>Mercurial Bookmark</source> <translation>Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/> <source>Delete Bookmark</source> <translation>Apagar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/> <source>Select the bookmark to be deleted:</source> <translation>Selecionar o marcador a apagar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> <source>Delete Mercurial Bookmark</source> <translation>Apagar o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3755"/> <source>Rename Mercurial Bookmark</source> <translation>Renomear o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3797"/> <source>Move Mercurial Bookmark</source> <translation>Mover o Marcador de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/> <source>Pull Bookmark</source> <translation>Puxar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/> <source>Select the bookmark to be pulled:</source> <translation>Selecionar o marcador a puxar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3903"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>A puxar marcador desde o repositório remoto de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/> <source>Push Bookmark</source> <translation>Empurrar Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/> <source>Select the bookmark to be push:</source> <translation>Selecione o marcador a empurrar:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3947"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>A empurrar marcador a um repositório remoto de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/> - <source>Canceling uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3113"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3126"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <source>Aborting uncommitted merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -35479,742 +35484,742 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>Tag in repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>&Tag in repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> - <source>Tag the local project in the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> - <source>List tags</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> - <source>List tags...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> - <source>List tags of the project</source> + <source>Tag the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> + <source>List tags</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>List branches</source> - <translation>Listar ramos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>List branches...</source> - <translation>Listar ramos...</translation> + <source>List tags...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/> - <source>List branches of the project</source> - <translation>Listar os ramos do projeto</translation> + <source>List tags of the project</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Listar ramos</b><p>Lista os ramos do projeto.</p></translation> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> - <source>Create branch</source> - <translation>Criar ramo</translation> + <source>List branches</source> + <translation>Listar ramos</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <source>List branches...</source> + <translation>Listar ramos...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> + <source>List branches of the project</source> + <translation>Listar os ramos do projeto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Listar ramos</b><p>Lista os ramos do projeto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> + <source>Create branch</source> + <translation>Criar ramo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Create &branch...</source> <translation>Criar &ramo...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/> <source>Create a new branch for the local project in the repository</source> <translation>Criar um ramo novo para o projeto local no repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Criar ramo</b><p>Cria um ramo novo para o projeto local no repositorio.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> <source>Close branch</source> <translation>Fechar ramo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> - <source>Close the current branch of the local project</source> - <translation>Fechar o ramo atual no projeto local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> - <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> - <translation><b>Fechar ramo</b><p>Fecha o ramo atual do projeto local.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> - <source>Show current branch</source> - <translation>Mostrar ramo atual</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> - <source>Show the current branch of the project</source> - <translation>Mostrar o ramo atual do projeto</translation> + <source>Close the current branch of the local project</source> + <translation>Fechar o ramo atual no projeto local</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation><b>Mostrar ramo atual</b><p>Mostra o ramo atual do projeto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> - <source>Switch</source> - <translation>Mudar</translation> + <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> + <translation><b>Fechar ramo</b><p>Fecha o ramo atual do projeto local.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <source>Show current branch</source> + <translation>Mostrar ramo atual</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> + <source>Show the current branch of the project</source> + <translation>Mostrar o ramo atual do projeto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation><b>Mostrar ramo atual</b><p>Mostra o ramo atual do projeto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> + <source>Switch</source> + <translation>Mudar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source>S&witch...</source> <translation>M&udar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source>Switch the working directory to another revision</source> <translation>Mudar o diretorio de trabalho a outra revisão</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Mudar</b><p>Muda o diretorio de trabalho a outra revisão.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> - <source>Cleanup</source> - <translation>Limpar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> - <source>Cleanu&p</source> - <translation>Lim&par</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source>Cleanup the local project</source> - <translation>Limpar o projeto local</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Limpar</b><p>Realiza uma limpeza ao projeto local.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source>Execute command</source> - <translation>Executar comando</translation> + <source>Cleanup</source> + <translation>Limpar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source>E&xecute command...</source> - <translation>E&xecutar comando...</translation> + <source>Cleanu&p</source> + <translation>Lim&par</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> - <source>Execute an arbitrary Mercurial command</source> - <translation>Executa um comando de Mercurial arbitrário</translation> + <source>Cleanup the local project</source> + <translation>Limpar o projeto local</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Limpar</b><p>Realiza uma limpeza ao projeto local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source>Execute command</source> + <translation>Executar comando</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source>E&xecute command...</source> + <translation>E&xecutar comando...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> + <source>Execute an arbitrary Mercurial command</source> + <translation>Executa um comando de Mercurial arbitrário</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Executar comando</b><p>Abre uma caixa de diálogo para introduzir um comando Mercurial arbitrário.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source>Configure</source> <translation>Configurar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source>Configure...</source> <translation>Configurar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Mostrar a caixa de diálogo de configuração com a página de Mercurial selecionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Configurar</b><p>Mostra a caixa de diálogo de configuração com a página de Mercurial selecionada.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> - <source>Show paths</source> - <translation>Mostrar rotas</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> - <source>Show paths...</source> - <translation>Mostrar rotas...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> - <source>Show the aliases for remote repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> - <source>Verify repository</source> - <translation>Verificar repositorio</translation> + <source>Show paths</source> + <translation>Mostrar rotas</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> - <source>Verify repository...</source> - <translation>Verificar repositorio...</translation> + <source>Show paths...</source> + <translation>Mostrar rotas...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> - <source>Verify the integrity of the repository</source> - <translation>Verificar a integridade do repositorio</translation> + <source>Show the aliases for remote repositories</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> - <translation><b>Verificar repositorio</b><p>Verifica a integridade do repositorio.</p></translation> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Recover</source> - <translation>Recuperar</translation> + <source>Verify repository</source> + <translation>Verificar repositorio</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Recover...</source> - <translation>Recuperar...</translation> + <source>Verify repository...</source> + <translation>Verificar repositorio...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> - <source>Recover from an interrupted transaction</source> - <translation>Recuperar duma transação interrompida</translation> + <source>Verify the integrity of the repository</source> + <translation>Verificar a integridade do repositorio</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> - <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> - <translation><b>Recuperar</b><p>Recupera de uma transação interrompida.</p></translation> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation><b>Verificar repositorio</b><p>Verifica a integridade do repositorio.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> - <source>Identify</source> - <translation>Identificar</translation> + <source>Recover</source> + <translation>Recuperar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> - <source>Identify...</source> - <translation>Identificar...</translation> + <source>Recover...</source> + <translation>Recuperar...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> - <source>Identify the project directory</source> - <translation>Identificar o diretorio do projeto</translation> + <source>Recover from an interrupted transaction</source> + <translation>Recuperar duma transação interrompida</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> - <source><b>Identify</b><p>This identifies the project directory.</p></source> - <translation><b>Identificar</b><p>Identifica o diretorio do projeto.</p></translation> + <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> + <translation><b>Recuperar</b><p>Recupera de uma transação interrompida.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> - <source>Create .hgignore</source> - <translation>Criar .hgignore</translation> + <source>Identify</source> + <translation>Identificar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> + <source>Identify...</source> + <translation>Identificar...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> - <source>Create a .hgignore file with default values</source> - <translation type="unfinished"></translation> + <source>Identify the project directory</source> + <translation>Identificar o diretorio do projeto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> - <source>Create changegroup</source> - <translation type="unfinished">Criar conjunto de alterações</translation> + <source><b>Identify</b><p>This identifies the project directory.</p></source> + <translation><b>Identificar</b><p>Identifica o diretorio do projeto.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <source>Create .hgignore</source> + <translation>Criar .hgignore</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/> + <source>Create changegroup</source> + <translation type="unfinished">Criar conjunto de alterações</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/> <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1863"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Mark as "good"</source> - <translation>Marcar como "bom"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Mark as "good"...</source> - <translation>Marcar como "bom"...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="830"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> - <source>Mark as "bad"</source> - <translation>Marcar como "mau"</translation> + <source>Mark as "good"</source> + <translation>Marcar como "bom"</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> - <source>Mark as "bad"...</source> - <translation>Marcar como "mau"...</translation> + <source>Mark as "good"...</source> + <translation>Marcar como "bom"...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> - <source>Mark a selectable changeset as bad</source> + <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> - <source>Skip</source> - <translation>Saltar</translation> + <source>Mark as "bad"</source> + <translation>Marcar como "mau"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> + <source>Mark as "bad"...</source> + <translation>Marcar como "mau"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> + <source>Mark a selectable changeset as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> - <source>Reset</source> - <translation>Restablecer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> - <source>Reset the bisect search data</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> - <translation type="unfinished"></translation> + <source>Skip</source> + <translation>Saltar</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> - <source>Back out changeset</source> - <translation type="unfinished"></translation> + <source>Reset</source> + <translation>Restablecer</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> - <source>Back out changes of an earlier changeset</source> + <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> - <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> - <source>Serve project repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> - <source>Serve project repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> - <source>Serve the project repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> - <source><b>Serve project repository</b><p>This serves the project repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> - <source>Specials</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> - <source>Changegroup Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359"/> - <source>Bisect</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656"/> - <source>Pull</source> - <translation>Puxar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/> - <source>The project should be reread. Do this now?</source> - <translation>O projecto deve ser recarregado. Fazer-lo agora?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> - <source>Push new branch</source> - <translation>Empurrar ramo novo</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> - <source>Push the current branch of the local project as a new named branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> - <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> - <source>Rollback last transaction</source> + <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <source>Back out changes of an earlier changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <source>Serve project repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <source>Serve project repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> + <source>Serve the project repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> + <source><b>Serve project repository</b><p>This serves the project repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/> + <source>Specials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1362"/> + <source>Changegroup Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1375"/> + <source>Bisect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1674"/> + <source>Pull</source> + <translation>Puxar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/> + <source>The project should be reread. Do this now?</source> + <translation>O projecto deve ser recarregado. Fazer-lo agora?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Push new branch</source> + <translation>Empurrar ramo novo</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/> + <source>Push the current branch of the local project as a new named branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> + <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> + <source>Rollback last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1420"/> <source>Extensions</source> <translation>Extensões</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> - <source>Edit user configuration</source> - <translation>Editar configuração de usuário</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> - <source>Edit user configuration...</source> - <translation>Editar configuração de usuário...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Show an editor to edit the user configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> - <source>Edit repository configuration</source> - <translation type="unfinished"></translation> + <source>Edit user configuration</source> + <translation>Editar configuração de usuário</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> + <source>Edit user configuration...</source> + <translation>Editar configuração de usuário...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> - <source>Show an editor to edit the repository configuration file</source> + <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <source>Show an editor to edit the repository configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> <source>Skip...</source> <translation>Saltar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1919"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1939"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> - <source>Export revisions to patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="961"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source>Change Phase</source> - <translation type="unfinished">Mudar Fase</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source>Change Phase...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> - <source>Change the phase of revisions</source> + <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <source>Change Phase</source> + <translation type="unfinished">Mudar Fase</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <source>Change Phase...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="989"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1959"/> <source>Copy Changesets</source> <translation type="unfinished">Copiar Conjuntos de Alterações</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1020"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1974"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> <source>Conflicts resolved</source> <translation type="unfinished">Conflitos resolvidos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Add</source> <translation>Adicionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Add...</source> <translation>Adicionar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Remove</source> <translation>Retirar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Remove...</source> <translation>Retirar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source>Remove sub-repositories</source> <translation>Retirar sub repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1080"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation><b>Retirar...</b><p>Retira sub repositorios do projeto.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1424"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440"/> <source>Sub-Repository</source> <translation></translation> </message> @@ -36244,27 +36249,27 @@ <translation><b>Mostrar sumário</b><p>Mostra alguma informação sumária do estado do diretorio de trabalho.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="917"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> @@ -36289,343 +36294,358 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> + <source>Re-Merge</source> + <translation>Remesclar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/> + <source>Re-Merge all conflicting, unresolved files of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="459"/> + <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> + <source>Show conflicts</source> + <translation>Mostrar conflitos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> + <source>Show conflicts...</source> + <translation>Mostrar conflitos...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> + <source>Show a dialog listing all files with conflicts</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> + <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <source>Conflicts unresolved</source> + <translation>Conflitos sem resolver</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> + <source>Mark all conflicts of the local project as unresolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> + <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> + <source>List bookmarks</source> + <translation>Listar marcadores</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> + <source>List bookmarks...</source> + <translation>Listar marcadores...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/> + <source>List bookmarks of the project</source> + <translation>Listar marcadores do projeto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1112"/> + <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> + <translation><b>Listar marcadores</b><p>Lista os marcadores do projeto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> + <source>Define bookmark</source> + <translation>Definir marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> + <source>Define bookmark...</source> + <translation>Definir marcador...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/> + <source>Define a bookmark for the project</source> + <translation>Definir um marcador para o projeto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1127"/> + <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> + <translation><b>Definir marcador</b><p>Define um marcador para o projeto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> + <source>Delete bookmark</source> + <translation>Apagar marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> + <source>Delete bookmark...</source> + <translation>Apagar Marcador...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/> + <source>Delete a bookmark of the project</source> + <translation>Apagar um marcador do projeto </translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142"/> + <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> + <translation><b>Apagar marcador</b><p>Apaga um marcador do projeto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> + <source>Rename bookmark</source> + <translation>Renomear marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> + <source>Rename bookmark...</source> + <translation>Renomear marcador...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> + <source>Rename a bookmark of the project</source> + <translation>Renomear um marcador do projeto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1157"/> + <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> + <translation><b>Renomear marcador</b><p>Renomeia um marcador do projeto</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> + <source>Move bookmark</source> + <translation>Mover marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> + <source>Move bookmark...</source> + <translation>Mover marcador...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> + <source>Move a bookmark of the project</source> + <translation>Mover um marcador do projeto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1172"/> + <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1180"/> + <source>Show incoming bookmarks</source> + <translation>Mostrar marcadores entrantes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> + <source>Show a list of incoming bookmarks</source> + <translation>Mostrar uma lista de marcadores entrantes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1188"/> + <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> + <translation><b>Mostrar marcadores entrantes</b><p>Mostra uma lista de marcadores novos disponíveis no repositório remoto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> + <source>Pull bookmark</source> + <translation>Puxar marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> + <source>Pull a bookmark from a remote repository</source> + <translation>Puxa um marcador desde um repositório remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1205"/> + <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> + <translation><b>Puxar marcador</b><p>Puxa (pull) um marcador desde um repositório remoto para o repositório local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1229"/> + <source>Show outgoing bookmarks</source> + <translation>Mostrar marcadores saintes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> + <source>Show a list of outgoing bookmarks</source> + <translation>Mostrar a lista de marcadores saintes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1237"/> + <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> + <translation><b>Mostrar marcadores saintes</b><p>Mostra a lista dos marcadores novos disponíveis no repositório local.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1246"/> + <source>Push bookmark</source> + <translation>Empurrar marcador</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> + <source>Push a bookmark to a remote repository</source> + <translation>Empurrar um marcador a um repositório remoto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1254"/> + <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> + <translation><b>Empurrar marcador</b><p>Empurra (push) um marcador do repositório local para o repositório remoto.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1328"/> + <source>Administration</source> + <translation>Administração</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1383"/> + <source>Tags</source> + <translation type="unfinished">Etiquetas</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390"/> + <source>Branches</source> + <translation>Ramos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399"/> + <source>Bookmarks</source> + <translation>Marcadores</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1528"/> + <source>Mercurial</source> + <translation>Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> + <source>Pull current bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> + <source>Pull the current bookmark from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1221"/> + <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1262"/> + <source>Push current bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1267"/> + <source>Push the current bookmark to a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1279"/> + <source>Delete all backups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1284"/> + <source>Delete all backup bundles stored in the backup area</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1287"/> + <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/> + <source>Stop Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> + <source>Stop the interrupted copying session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <source>Abort Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> + <source>Abort the interrupted copying session and rollback</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> + <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1445"/> + <source>Merge Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1988"/> + <source>Copy Changesets (Stop)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/> + <source>Copy Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> + <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> - <source>Cancel uncommitted merge</source> + <source>Commit Merge</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> - <source>Cancel an uncommitted merge and lose all changes</source> + <source>Commit a merge.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> - <source>Re-Merge</source> - <translation>Remesclar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> - <source>Re-Merge all conflicting, unresolved files of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="445"/> - <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> - <source>Show conflicts</source> - <translation>Mostrar conflitos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> - <source>Show conflicts...</source> - <translation>Mostrar conflitos...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> - <source>Show a dialog listing all files with conflicts</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> - <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> - <source>Conflicts unresolved</source> - <translation>Conflitos sem resolver</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> - <source>Mark all conflicts of the local project as unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> - <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> - <source>List bookmarks</source> - <translation>Listar marcadores</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> - <source>List bookmarks...</source> - <translation>Listar marcadores...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> - <source>List bookmarks of the project</source> - <translation>Listar marcadores do projeto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> - <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> - <translation><b>Listar marcadores</b><p>Lista os marcadores do projeto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> - <source>Define bookmark</source> - <translation>Definir marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> - <source>Define bookmark...</source> - <translation>Definir marcador...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1110"/> - <source>Define a bookmark for the project</source> - <translation>Definir um marcador para o projeto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> - <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> - <translation><b>Definir marcador</b><p>Define um marcador para o projeto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> - <source>Delete bookmark</source> - <translation>Apagar marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> - <source>Delete bookmark...</source> - <translation>Apagar Marcador...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125"/> - <source>Delete a bookmark of the project</source> - <translation>Apagar um marcador do projeto </translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> - <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> - <translation><b>Apagar marcador</b><p>Apaga um marcador do projeto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> - <source>Rename bookmark</source> - <translation>Renomear marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> - <source>Rename bookmark...</source> - <translation>Renomear marcador...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1140"/> - <source>Rename a bookmark of the project</source> - <translation>Renomear um marcador do projeto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> - <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> - <translation><b>Renomear marcador</b><p>Renomeia um marcador do projeto</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> - <source>Move bookmark</source> - <translation>Mover marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> - <source>Move bookmark...</source> - <translation>Mover marcador...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155"/> - <source>Move a bookmark of the project</source> - <translation>Mover um marcador do projeto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1158"/> - <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> - <source>Show incoming bookmarks</source> - <translation>Mostrar marcadores entrantes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/> - <source>Show a list of incoming bookmarks</source> - <translation>Mostrar uma lista de marcadores entrantes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1174"/> - <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> - <translation><b>Mostrar marcadores entrantes</b><p>Mostra uma lista de marcadores novos disponíveis no repositório remoto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> - <source>Pull bookmark</source> - <translation>Puxar marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1188"/> - <source>Pull a bookmark from a remote repository</source> - <translation>Puxa um marcador desde um repositório remoto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1191"/> - <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> - <translation><b>Puxar marcador</b><p>Puxa (pull) um marcador desde um repositório remoto para o repositório local.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> - <source>Show outgoing bookmarks</source> - <translation>Mostrar marcadores saintes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/> - <source>Show a list of outgoing bookmarks</source> - <translation>Mostrar a lista de marcadores saintes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223"/> - <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> - <translation><b>Mostrar marcadores saintes</b><p>Mostra a lista dos marcadores novos disponíveis no repositório local.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1232"/> - <source>Push bookmark</source> - <translation>Empurrar marcador</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1237"/> - <source>Push a bookmark to a remote repository</source> - <translation>Empurrar um marcador a um repositório remoto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1240"/> - <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> - <translation><b>Empurrar marcador</b><p>Empurra (push) um marcador do repositório local para o repositório remoto.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1312"/> - <source>Administration</source> - <translation>Administração</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> - <source>Tags</source> - <translation type="unfinished">Etiquetas</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1374"/> - <source>Branches</source> - <translation>Ramos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1383"/> - <source>Bookmarks</source> - <translation>Marcadores</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511"/> - <source>Mercurial</source> - <translation>Mercurial</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> - <source>Pull current bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/> - <source>Pull the current bookmark from a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1207"/> - <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> - <source>Push current bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/> - <source>Push the current bookmark to a remote repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> - <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> - <source>Delete all backups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> - <source>Delete all backup bundles stored in the backup area</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1273"/> - <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> - <source>Stop Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1018"/> - <source>Stop the interrupted copying session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/> - <source>Abort Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> - <source>Abort the interrupted copying session and rollback</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> - <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1429"/> - <source>Merge Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1964"/> - <source>Copy Changesets (Stop)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/> - <source>Copy Changesets (Abort)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> - <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> + <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <source>Abort Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> + <source>Abort an uncommitted merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443"/> + <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> <translation type="unfinished"></translation> </message> </context> @@ -47725,202 +47745,202 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="853"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="854"/> <source>Serial Device Connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="853"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="854"/> <source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="898"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="899"/> <source>Run Script</source> <translation type="unfinished">Executar Script</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="881"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="882"/> <source>There is no editor open. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="889"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="890"/> <source>The current editor does not contain a script. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="898"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="899"/> <source><p>Cannot run script.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="922"/> <source>Open Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="922"/> <source>Python3 Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="965"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="966"/> <source>Start Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="965"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="966"/> <source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="995"/> <source>Unsaved Chart Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="995"/> <source>The chart contains unsaved data.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/> <source>Start File Manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/> <source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1097"/> <source>Show Version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1100"/> <source>Show Implementation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> <source>Synchronize Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1108"/> <source>Show Device Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1111"/> <source>Show Local Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1339"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1361"/> <source>Compile Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1359"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1381"/> <source>Compile Current Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1132"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1135"/> <source><h3>Device Version Information</h3></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1141"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1144"/> <source>No version information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1143"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1146"/> <source>Device Version Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1166"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1169"/> <source>unknown</source> <translation type="unfinished">desconhecido</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/> <source>Device Implementation Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/> <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> <source><p>The time of the connected device was synchronized with the local time.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1216"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1219"/> <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1224"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1227"/> <source><h3>Device Date and Time</h3><p>{0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1238"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1241"/> <source>Device Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/> <source>Local Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/> <source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/> <source>Error handling device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/> <source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1291"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1313"/> <source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1309"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1331"/> <source>Python Files (*.py);;All Files (*)</source> <translation type="unfinished">Ficheiros Python (*.py);;Ficheiros Todos (*)</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1319"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1341"/> <source>The Python file <b>{0}</b> does not exist. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1329"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1351"/> <source>'mpy-cross' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1352"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> <source>The current editor does not contain a Python file. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -47935,12 +47955,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="978"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="979"/> <source>µPy Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1059"/> <source>µPy Files</source> <translation type="unfinished"></translation> </message> @@ -78356,7 +78376,7 @@ <translation>Mostrar as versões disponíveis para descarregar</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3724"/> + <location filename="../UI/UserInterface.py" line="3731"/> <source>Report Bug</source> <translation>Reportar Falho</translation> </message> @@ -78396,7 +78416,7 @@ <translation><b>Solicitar Característica...</b><p>Abre uma caixa de diálogo para enviar uma solicitude de característica.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3278"/> + <location filename="../UI/UserInterface.py" line="3285"/> <source>Unittest</source> <translation>Teste Unitário</translation> </message> @@ -78741,7 +78761,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6313"/> + <location filename="../UI/UserInterface.py" line="6320"/> <source>Export Keyboard Shortcuts</source> <translation>Exportar Atalhos de Teclado</translation> </message> @@ -78761,7 +78781,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6337"/> + <location filename="../UI/UserInterface.py" line="6344"/> <source>Import Keyboard Shortcuts</source> <translation>Importar Atalhos de Teclado</translation> </message> @@ -78976,7 +78996,7 @@ <translation>&Janela</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3189"/> + <location filename="../UI/UserInterface.py" line="3196"/> <source>&Toolbars</source> <translation>Barras de Ferramen&tas</translation> </message> @@ -78991,122 +79011,122 @@ <translation>Configurar...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3202"/> + <location filename="../UI/UserInterface.py" line="3209"/> <source>&Help</source> <translation>&Ajuda</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3277"/> + <location filename="../UI/UserInterface.py" line="3284"/> <source>Tools</source> <translation>Ferramentas</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3279"/> + <location filename="../UI/UserInterface.py" line="3286"/> <source>Settings</source> <translation>Definições</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5111"/> + <location filename="../UI/UserInterface.py" line="5118"/> <source>Help</source> <translation>Ajuda</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3281"/> + <location filename="../UI/UserInterface.py" line="3288"/> <source>Profiles</source> <translation>Perfiles</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3282"/> + <location filename="../UI/UserInterface.py" line="3289"/> <source>Plugins</source> <translation>Complementos</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3447"/> - <source><p>This part of the status bar displays the current editors language.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="3454"/> - <source><p>This part of the status bar displays the current editors encoding.</p></source> + <source><p>This part of the status bar displays the current editors language.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../UI/UserInterface.py" line="3461"/> - <source><p>This part of the status bar displays the current editors eol setting.</p></source> + <source><p>This part of the status bar displays the current editors encoding.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../UI/UserInterface.py" line="3468"/> - <source><p>This part of the status bar displays an indication of the current editors files writability.</p></source> + <source><p>This part of the status bar displays the current editors eol setting.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../UI/UserInterface.py" line="3475"/> - <source><p>This part of the status bar displays the line number of the current editor.</p></source> + <source><p>This part of the status bar displays an indication of the current editors files writability.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../UI/UserInterface.py" line="3482"/> + <source><p>This part of the status bar displays the line number of the current editor.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="3489"/> <source><p>This part of the status bar displays the cursor position of the current editor.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3558"/> + <location filename="../UI/UserInterface.py" line="3565"/> <source>External Tools/{0}</source> <translation>Ferramentas Externas/{0}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3664"/> + <location filename="../UI/UserInterface.py" line="3671"/> <source><h3>Version Numbers</h3><table></source> <translation><h3>Números de Versão</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7302"/> + <location filename="../UI/UserInterface.py" line="7309"/> <source></table></source> <translation></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3724"/> + <location filename="../UI/UserInterface.py" line="3731"/> <source>Email address or mail server address is empty. Please configure your Email settings in the Preferences Dialog.</source> <translation>A direção do correio eletrónico ou a direção do servidor de correio está vazia. Por favor configure as Definiçães de Correio Eletrónico na Caixa de Diálogo de Preferências.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4009"/> + <location filename="../UI/UserInterface.py" line="4016"/> <source>Restart application</source> <translation>Reiniciar a aplicação</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4009"/> + <location filename="../UI/UserInterface.py" line="4016"/> <source>The application needs to be restarted. Do it now?</source> <translation>A aplicação necessita ser reiniciada. Reiniciar agora?</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4090"/> + <location filename="../UI/UserInterface.py" line="4097"/> <source>Configure Tool Groups ...</source> <translation>Configurar Grupos de Ferramentas...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4094"/> + <location filename="../UI/UserInterface.py" line="4101"/> <source>Configure current Tool Group ...</source> <translation>Configurar o atual Grupo de Ferramentas ...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4045"/> + <location filename="../UI/UserInterface.py" line="4052"/> <source>&Builtin Tools</source> <translation>Ferramentas &Internas</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4062"/> + <location filename="../UI/UserInterface.py" line="4069"/> <source>&Plugin Tools</source> <translation>Ferramentas dos &Complementos</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4210"/> + <location filename="../UI/UserInterface.py" line="4217"/> <source>&Show all</source> <translation>&Mostrar tudo</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4212"/> + <location filename="../UI/UserInterface.py" line="4219"/> <source>&Hide all</source> <translation>&Esconder tudo</translation> </message> @@ -79116,210 +79136,210 @@ <translation type="obsolete">O projeto atual não tem um script principal definido. A cancelar</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5058"/> + <location filename="../UI/UserInterface.py" line="5065"/> <source>Qt 3 support</source> <translation>Suporte Qt3</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5237"/> + <location filename="../UI/UserInterface.py" line="5244"/> <source>Problem</source> <translation>Problema</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5237"/> + <location filename="../UI/UserInterface.py" line="5244"/> <source><p>The file <b>{0}</b> does not exist or is zero length.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5426"/> + <location filename="../UI/UserInterface.py" line="5433"/> <source>Process Generation Error</source> <translation>Erro na Criação de Processo</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4961"/> + <location filename="../UI/UserInterface.py" line="4968"/> <source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5030"/> + <location filename="../UI/UserInterface.py" line="5037"/> <source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5083"/> + <location filename="../UI/UserInterface.py" line="5090"/> <source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5111"/> + <location filename="../UI/UserInterface.py" line="5118"/> <source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source> <translation>Não há nenhum visor personalizado selecionado. Por favor use a caixa de diálogo das preferências para escolher um.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5125"/> + <location filename="../UI/UserInterface.py" line="5132"/> <source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5145"/> + <location filename="../UI/UserInterface.py" line="5152"/> <source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5193"/> + <location filename="../UI/UserInterface.py" line="5200"/> <source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5248"/> + <location filename="../UI/UserInterface.py" line="5255"/> <source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5269"/> + <location filename="../UI/UserInterface.py" line="5276"/> <source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5371"/> + <location filename="../UI/UserInterface.py" line="5378"/> <source>External Tools</source> <translation>Ferramentas Externas</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5362"/> + <location filename="../UI/UserInterface.py" line="5369"/> <source>No tool entry found for external tool '{0}' in tool group '{1}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5371"/> + <location filename="../UI/UserInterface.py" line="5378"/> <source>No toolgroup entry '{0}' found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5410"/> + <location filename="../UI/UserInterface.py" line="5417"/> <source>Starting process '{0} {1}'. </source> <translation>A iniciar processo '{0} {1}'. </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5426"/> + <location filename="../UI/UserInterface.py" line="5433"/> <source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5502"/> + <location filename="../UI/UserInterface.py" line="5509"/> <source>Process '{0}' has exited. </source> <translation>Processo '{0}' saiu.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5901"/> + <location filename="../UI/UserInterface.py" line="5908"/> <source>Documentation Missing</source> <translation>Falta a Documentação</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5901"/> + <location filename="../UI/UserInterface.py" line="5908"/> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5884"/> + <location filename="../UI/UserInterface.py" line="5891"/> <source>Documentation</source> <translation>Documentação</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5709"/> + <location filename="../UI/UserInterface.py" line="5716"/> <source><p>The PyQt4 documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6337"/> + <location filename="../UI/UserInterface.py" line="6344"/> <source>Keyboard shortcut file (*.e4k)</source> <translation>Ficheiro de atalhos de teclado (*.e4k)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6506"/> + <location filename="../UI/UserInterface.py" line="6513"/> <source>Save tasks</source> <translation>Gravar tarefas</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6506"/> + <location filename="../UI/UserInterface.py" line="6513"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6535"/> + <location filename="../UI/UserInterface.py" line="6542"/> <source>Read tasks</source> <translation>Ler tarefas</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6535"/> + <location filename="../UI/UserInterface.py" line="6542"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6631"/> + <location filename="../UI/UserInterface.py" line="6638"/> <source>Save session</source> <translation>Guargar sessão</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6569"/> + <location filename="../UI/UserInterface.py" line="6576"/> <source><p>The session file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6615"/> + <location filename="../UI/UserInterface.py" line="6622"/> <source>Read session</source> <translation>Sessão de leitura</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6615"/> + <location filename="../UI/UserInterface.py" line="6622"/> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6902"/> <source>Drop Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6902"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> não é um ficheiro.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7080"/> + <location filename="../UI/UserInterface.py" line="7087"/> <source>&Cancel</source> <translation>&Cancelar</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7089"/> + <location filename="../UI/UserInterface.py" line="7096"/> <source>Trying host {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7245"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Update available</source> <translation>Atualização disponível</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7264"/> + <location filename="../UI/UserInterface.py" line="7271"/> <source>Error during updates check</source> <translation>Erro na verificação de atualizações</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7264"/> + <location filename="../UI/UserInterface.py" line="7271"/> <source>Could not perform updates check.</source> <translation>Não procurar atualizações.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7288"/> + <location filename="../UI/UserInterface.py" line="7295"/> <source><h3>Available versions</h3><table></source> <translation><h3>Versões Disponíveis</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7339"/> + <location filename="../UI/UserInterface.py" line="7346"/> <source>First time usage</source> <translation>Usado a primeira vez</translation> </message> @@ -79359,27 +79379,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7153"/> + <location filename="../UI/UserInterface.py" line="7160"/> <source>Error getting versions information</source> <translation>Erro na obtenção da informação de versões</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7146"/> - <source>The versions information could not be downloaded. Please go online and try again.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="6103"/> - <source>Open Browser</source> - <translation>Abrir Navegador</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="6103"/> - <source>Could not start a web browser</source> - <translation>Não se pôde iniciar um navegador web</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7153"/> + <source>The versions information could not be downloaded. Please go online and try again.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="6110"/> + <source>Open Browser</source> + <translation>Abrir Navegador</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="6110"/> + <source>Could not start a web browser</source> + <translation>Não se pôde iniciar um navegador web</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7160"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -79465,12 +79485,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5339"/> + <location filename="../UI/UserInterface.py" line="5346"/> <source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7358"/> + <location filename="../UI/UserInterface.py" line="7365"/> <source>Select Workspace Directory</source> <translation>Selecionar o Diretório de Trabalho</translation> </message> @@ -79835,7 +79855,7 @@ <translation>Abrir a Documentação de PyQt5</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5771"/> + <location filename="../UI/UserInterface.py" line="5778"/> <source><p>The PyQt5 documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> @@ -79845,7 +79865,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7080"/> + <location filename="../UI/UserInterface.py" line="7087"/> <source>%v/%m</source> <translation></translation> </message> @@ -79930,32 +79950,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5058"/> + <location filename="../UI/UserInterface.py" line="5065"/> <source>Qt v.3 is not supported by eric6.</source> <translation>Qt v.3 não está suportado por eric6.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7084"/> + <location filename="../UI/UserInterface.py" line="7091"/> <source>Version Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7245"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation>Atualização a <b>{0}</b> de eric6 já está disponível em <b>{1}</b>. Quere-a descarregar?</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7257"/> + <location filename="../UI/UserInterface.py" line="7264"/> <source>Eric6 is up to date</source> <translation>Eric6 está atualizado</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7257"/> + <location filename="../UI/UserInterface.py" line="7264"/> <source>You are using the latest version of eric6</source> <translation>Utiliza a última versão do eric6</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7339"/> + <location filename="../UI/UserInterface.py" line="7346"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation>eric6 ainda não foi configurado. A caixa de diálogo de configuração vai iniciar-se.</translation> </message> @@ -79965,17 +79985,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4065"/> + <location filename="../UI/UserInterface.py" line="4072"/> <source>&User Tools</source> <translation>Ferramentas de &Utilizador</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4137"/> + <location filename="../UI/UserInterface.py" line="4144"/> <source>No User Tools Configured</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7100"/> + <location filename="../UI/UserInterface.py" line="7107"/> <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -80020,7 +80040,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6653"/> + <location filename="../UI/UserInterface.py" line="6660"/> <source>Load session</source> <translation type="unfinished">Carregar sessão</translation> </message> @@ -80035,17 +80055,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6653"/> + <location filename="../UI/UserInterface.py" line="6660"/> <source>eric6 Session Files (*.e5s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6700"/> + <location filename="../UI/UserInterface.py" line="6707"/> <source>Crash Session found!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6700"/> + <location filename="../UI/UserInterface.py" line="6707"/> <source>A session file of a crashed session was found. Shall this session be restored?</source> <translation type="unfinished"></translation> </message> @@ -80060,17 +80080,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7233"/> + <location filename="../UI/UserInterface.py" line="7240"/> <source>Update Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7233"/> + <location filename="../UI/UserInterface.py" line="7240"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7223"/> + <location filename="../UI/UserInterface.py" line="7230"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation type="unfinished"></translation> </message> @@ -80125,7 +80145,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5884"/> + <location filename="../UI/UserInterface.py" line="5891"/> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> @@ -80160,22 +80180,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3128"/> + <location filename="../UI/UserInterface.py" line="3135"/> <source>Left Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3144"/> + <location filename="../UI/UserInterface.py" line="3151"/> <source>Bottom Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3155"/> + <location filename="../UI/UserInterface.py" line="3162"/> <source>Right Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3179"/> + <location filename="../UI/UserInterface.py" line="3186"/> <source>Plug-ins</source> <translation type="unfinished"></translation> </message> @@ -80201,17 +80221,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6058"/> + <location filename="../UI/UserInterface.py" line="6065"/> <source>Start Web Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6000"/> + <location filename="../UI/UserInterface.py" line="6007"/> <source>The eric6 web browser could not be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6058"/> + <location filename="../UI/UserInterface.py" line="6065"/> <source><p>The eric6 web browser is not started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -80226,7 +80246,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3493"/> + <location filename="../UI/UserInterface.py" line="3500"/> <source><p>This part of the status bar allows zooming the current editor or shell.</p></source> <translation type="unfinished"></translation> </message> @@ -80300,6 +80320,11 @@ <source><b>MicroPython</b><p>This switches the input focus to the MicroPython window.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../UI/UserInterface.py" line="3128"/> + <source>Central Park</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name> @@ -90234,24 +90259,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1427"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Pai #{0}</b></td><td></td></tr> <tr><td><b>Conjunto de Alterações</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <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="2066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Ramos</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1447"/> <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> @@ -90260,24 +90285,24 @@ <tr><td><b>Hora do Cometido</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Dica</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Conjunto de Alterações</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Pais</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <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> @@ -90288,12 +90313,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1481"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -90310,13 +90335,13 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/eric6/i18n/eric6_ru.ts Fri Aug 23 13:23:22 2019 +0200 +++ b/eric6/i18n/eric6_ru.ts Fri Aug 23 13:23:36 2019 +0200 @@ -6953,7 +6953,7 @@ <message> <location filename="../Debugger/DebugUI.py" line="597"/> <source>&Start</source> - <translation>З&апуск</translation> + <translation type="obsolete">З&апуск</translation> </message> <message> <location filename="../Debugger/DebugUI.py" line="599"/> @@ -7168,6 +7168,11 @@ <source>No locals available.</source> <translation>Нет доступных локальных переменных.</translation> </message> + <message> + <location filename="../Debugger/DebugUI.py" line="597"/> + <source>Sta&rt</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DebugViewer</name> @@ -31330,7 +31335,7 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> @@ -31360,420 +31365,425 @@ <translation>Mercurial: Клонирование проекта из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="630"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> <source>Synchronizing with the Mercurial repository</source> <translation>Mercurial: Синхронизация с репозиторием</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="691"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Mercurial: Добавление файлов/директорий в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="760"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Mercurial: Удаление файлов/директорий из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/> <source>Renaming {0}</source> <translation>Переименование {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/> <source>Reverting changes</source> <translation>Возврат изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1061"/> <source>Merging</source> <translation>Слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1361"/> <source>Mercurial command</source> <translation>Mercurial: Команда</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936"/> <source>Pulling from a remote Mercurial repository</source> <translation>Затягивание изменений из удалённого Mercurial репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1983"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <source>Pushing to a remote Mercurial repository</source> <translation>Mercurial: Проталкивание изменений в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветви в Mercurial репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2223"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/> <source>Showing current branch</source> <translation>Отображение текущей ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Mercurial: Проверка целостности репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2377"/> <source>Showing the combined configuration settings</source> <translation>Отображение обобщенных параметров конфигурации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2401"/> <source>Showing aliases for remote repositories</source> <translation>Отображение алиасов удалённых репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2414"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/> <source>Identifying project directory</source> <translation>Идентификация директории проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <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="2576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2544"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Файлы группы изменений Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2550"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл группы изменений Mercurial<b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2608"/> <source>Preview changegroup</source> <translation>Просмотр группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2647"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Файлы группы изменений Mercurial (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2656"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочую директорию?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2687"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Bisect: Недействительная подкоманда ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial: Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/> <source>Removing files from the Mercurial repository only</source> <translation>Mercurial: Удаление файлов только из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2802"/> <source>Backing out changeset</source> <translation>Отмена набора изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2782"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2829"/> <source>Rollback last transaction</source> <translation>Откатить последнюю транзакцию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2822"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Вы действительно хотите откатить последнюю транзакцию?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="555"/> <source>Committing changes to Mercurial repository</source> <translation>Mercurial: Фиксация изменений в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/> <source>Mercurial Command Server</source> <translation>Mercurial: Сервер команд</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3426"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>Mercurial: Невозможно перезапустить сервер.<br>Причина: {0}.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Mercurial: Невозможно запустить сервер.<br>Причина: {0}.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2897"/> <source>Import Patch</source> <translation>Импорт патча</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2938"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2949"/> <source>Export Patches</source> <translation>Экспорт патчей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2996"/> <source>Change Phase</source> <translation>Изменить фазу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3052"/> <source>Copy Changesets</source> <translation>Копировать набор изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3101"/> <source>Copy Changesets (Continue)</source> <translation>Копировать набор изменений (Continue)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/> <source>Add Sub-repository</source> <translation>Добавить субрепозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3292"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>Невозможно прочитать файл субрепозиториев .hgsub.<b></b>Причина {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>Файл субрепозиториев .hgsub уже содержит запись <b>{0}</b>. Отмена...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>Невозможно записать файл субрепозиториев .hgsub.<p><p>Причина: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> <source>Remove Sub-repositories</source> <translation>Удалить субрепозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3280"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Отсутствует файл субрепозиториев .hgsub. Отмена...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> <source>Commit Changes</source> <translation>Фиксация изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation>Фиксация влияет на файлы с несохраненными изменениями. Продолжить ли фиксацию?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> <source>Revert changes</source> <translation>Возврат изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="984"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="995"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation>Вы действительно хотите вернуть все изменения в этих файлах и директориях?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> <source>Do you really want to revert all changes of the project?</source> <translation>Вы действительно хотите вернуть все изменения в проекте?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3156"/> <source>Create Unversioned Archive</source> <translation>Создать неверсированный архив</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> <source>Mercurial Side-by-Side Difference</source> <translation>Mercurial: Построчный просмотр различий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1787"/> <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/hg.py" line="943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="954"/> <source>Tagging in the Mercurial repository</source> <translation>Mercurial: Добавление тегов в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Created new branch <{0}>.</source> <translation>Создана новая ветвь <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> <source>Current branch tip</source> <translation>Конечная ревизия текущей ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3689"/> <source>Mercurial Bookmark</source> <translation>Mercurial: Закладка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/> <source>Delete Bookmark</source> <translation>Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/> <source>Select the bookmark to be deleted:</source> <translation>Выберите закладку для удаления:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> <source>Delete Mercurial Bookmark</source> <translation>Mercurial: Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3755"/> <source>Rename Mercurial Bookmark</source> <translation>Mercurial: Переименовать закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3797"/> <source>Move Mercurial Bookmark</source> <translation>Mercurial: Переместить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/> <source>Pull Bookmark</source> <translation>Затянуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/> <source>Select the bookmark to be pulled:</source> <translation>Выберите закладку для затягивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3903"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Затянуть закладку из удалённого Mercurial репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/> <source>Push Bookmark</source> <translation>Протолкнуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/> <source>Select the bookmark to be push:</source> <translation>Выберите закладку для проталкивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3947"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Mercurial: Проталкивание закладки в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/> <source>Re-Merge</source> <translation>Повторить слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1098"/> <source>Do you really want to re-merge these files or directories?</source> <translation>Вы действительно хотите повторить слияние этих файлов или директорий?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/> <source>Do you really want to re-merge the project?</source> <translation>Вы действительно хотите повторить слияние проекта?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/> <source>Re-Merging</source> <translation>Повторное слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <source>Marking as 'unresolved'</source> <translation>Помеченные как 'unresolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> <source>Marking as 'resolved'</source> <translation>Помеченные как 'resolved'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/> <source>Delete All Backups</source> <translation>Удалить все резервные копии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation><p>Вы действительно хотите удалить все резервные комплекты, сохраненные в 'области резервного копирования'<b>{0}</b>?</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/> <source>Canceling uncommitted merge</source> - <translation>Отмена незавершенного слияния</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3102"/> + <translation type="obsolete">Отмена незавершенного слияния</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3113"/> <source>Copy Changesets (Stop)</source> <translation>Копировать набор изменений (Stop)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3126"/> <source>Copy Changesets (Abort)</source> <translation>Копировать набор изменений (Abort)</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <source>Aborting uncommitted merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -35550,742 +35560,742 @@ <translation><b>Слить</b><p>Слить изменения из ревизии с локальным проектом.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>Tag in repository</source> <translation>Тег в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>&Tag in repository...</source> <translation>&Тег в репозитории...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> - <source>Tag the local project in the repository</source> - <translation>Тег локального проекта в репозитории</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Тег в репозитории</b><p>Теги локального проекта в репозитории.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> - <source>List tags</source> - <translation>Список тегов</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> - <source>List tags...</source> - <translation>Список тегов...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> - <source>List tags of the project</source> - <translation>Список тегов проекта</translation> + <source>Tag the local project in the repository</source> + <translation>Тег локального проекта в репозитории</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>Список тегов</b><p>Отображает список тегов проекта.</p></translation> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Тег в репозитории</b><p>Теги локального проекта в репозитории.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>List branches</source> - <translation>Список ветвей</translation> + <source>List tags</source> + <translation>Список тегов</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>List branches...</source> - <translation>Список ветвей...</translation> + <source>List tags...</source> + <translation>Список тегов...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/> - <source>List branches of the project</source> - <translation>Список ветвей текущего проекта</translation> + <source>List tags of the project</source> + <translation>Список тегов проекта</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Список ветвей</b><p>Отображает список ветвей текущего проекта.</p></translation> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Список тегов</b><p>Отображает список тегов проекта.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> - <source>Create branch</source> - <translation>Создать ветвь</translation> + <source>List branches</source> + <translation>Список ветвей</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <source>List branches...</source> + <translation>Список ветвей...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> + <source>List branches of the project</source> + <translation>Список ветвей текущего проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Список ветвей</b><p>Отображает список ветвей текущего проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> + <source>Create branch</source> + <translation>Создать ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Create &branch...</source> <translation>Создать &ветвь...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/> <source>Create a new branch for the local project in the repository</source> <translation>Создать новую ветвь локального проекта в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Создать ветвь</b><p>Создать новую ветвь локального проекта в репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> <source>Close branch</source> <translation>Закрыть ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> - <source>Close the current branch of the local project</source> - <translation>Закрыть ветвь локального проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> - <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> - <translation><b>Закрыть ветвь</b><p>Закрытие ветви локального проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> - <source>Show current branch</source> - <translation>Показать текущую ветвь</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> - <source>Show the current branch of the project</source> - <translation>Отображение текущей ветви проекта</translation> + <source>Close the current branch of the local project</source> + <translation>Закрыть ветвь локального проекта</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation><b>Показать текущую ветвь</b><p>Отображение текущей ветви проекта.</p></translation> + <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> + <translation><b>Закрыть ветвь</b><p>Закрытие ветви локального проекта.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <source>Show current branch</source> + <translation>Показать текущую ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> + <source>Show the current branch of the project</source> + <translation>Отображение текущей ветви проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation><b>Показать текущую ветвь</b><p>Отображение текущей ветви проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source>Switch</source> <translation>Переключиться</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source>S&witch...</source> <translation>Пе&реключиться (switch)...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source>Switch the working directory to another revision</source> <translation>Переключить рабочую директорию на другую ревизию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Переключить</b><p>Переключение рабочей директории на другую ревизию.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> - <source>Cleanup</source> - <translation>Очистить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> - <source>Cleanu&p</source> - <translation>О&чистить (cleanup)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source>Cleanup the local project</source> - <translation>Очистить локальный проект</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Очистить</b><p>Выполнение очистки локального проекта.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source>Execute command</source> - <translation>Выполнить команду</translation> + <source>Cleanup</source> + <translation>Очистить</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source>E&xecute command...</source> - <translation>В&ыполнить команду...</translation> + <source>Cleanu&p</source> + <translation>О&чистить (cleanup)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> - <source>Execute an arbitrary Mercurial command</source> - <translation>Выполнить произвольную команду Mercurial</translation> + <source>Cleanup the local project</source> + <translation>Очистить локальный проект</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Очистить</b><p>Выполнение очистки локального проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source>Execute command</source> + <translation>Выполнить команду</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source>E&xecute command...</source> + <translation>В&ыполнить команду...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> + <source>Execute an arbitrary Mercurial command</source> + <translation>Выполнить произвольную команду Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Выполнить команду</b><p>Открытие диалога ввода произвольной команды Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source>Configure</source> <translation>Настройки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source>Configure...</source> <translation>Настройки...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Отображение диалога настроек с выбранной страницей настроек Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Настройки</b><p>Отображение диалога настроек с выбранной страницей настроек Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> - <source>Show paths</source> - <translation>Показать пути</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> - <source>Show paths...</source> - <translation>Показать пути...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> - <source>Show the aliases for remote repositories</source> - <translation>Алиасы для удалённых репозиториев</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation><b>Показать пути</b><p>Показать алиасы для удалённых репозиториев.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> - <source>Verify repository</source> - <translation>Проверить репозиторий</translation> + <source>Show paths</source> + <translation>Показать пути</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> - <source>Verify repository...</source> - <translation>Проверить репозиторий...</translation> + <source>Show paths...</source> + <translation>Показать пути...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> - <source>Verify the integrity of the repository</source> - <translation>Проверить целостность репозитория</translation> + <source>Show the aliases for remote repositories</source> + <translation>Алиасы для удалённых репозиториев</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> - <translation><b>Проверить целостность репозитория</b><p>Проверить целостность репозитория.</p></translation> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation><b>Показать пути</b><p>Показать алиасы для удалённых репозиториев.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Recover</source> - <translation>Восстановить</translation> + <source>Verify repository</source> + <translation>Проверить репозиторий</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Recover...</source> - <translation>Восстановить...</translation> + <source>Verify repository...</source> + <translation>Проверить репозиторий...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> - <source>Recover from an interrupted transaction</source> - <translation>Восстановление после прерванной транзакции</translation> + <source>Verify the integrity of the repository</source> + <translation>Проверить целостность репозитория</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> - <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> - <translation><b>Восстановить</b><p>Восстановление после прерванной транзакции.</p></translation> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation><b>Проверить целостность репозитория</b><p>Проверить целостность репозитория.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> - <source>Identify</source> - <translation>Идентификация</translation> + <source>Recover</source> + <translation>Восстановить</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> - <source>Identify...</source> - <translation>Идентификация...</translation> + <source>Recover...</source> + <translation>Восстановить...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> - <source>Identify the project directory</source> - <translation>Идентификация директории проекта</translation> + <source>Recover from an interrupted transaction</source> + <translation>Восстановление после прерванной транзакции</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> - <source><b>Identify</b><p>This identifies the project directory.</p></source> - <translation><b>Идентификация</b><p>Идентификация директории проекта.</p></translation> + <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> + <translation><b>Восстановить</b><p>Восстановление после прерванной транзакции.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> - <source>Create .hgignore</source> - <translation>Создать файл .hgignore</translation> + <source>Identify</source> + <translation>Идентификация</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> + <source>Identify...</source> + <translation>Идентификация...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> - <source>Create a .hgignore file with default values</source> - <translation>Создать файл .hgignore со значениями по умолчанию</translation> + <source>Identify the project directory</source> + <translation>Идентификация директории проекта</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation><b>Создать файл .hgignore</b><p>Создать файл .hgignore со значениями по умолчанию.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> - <source>Create changegroup</source> - <translation>Создать группу изменений</translation> + <source><b>Identify</b><p>This identifies the project directory.</p></source> + <translation><b>Идентификация</b><p>Идентификация директории проекта.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <source>Create .hgignore</source> + <translation>Создать файл .hgignore</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> + <source>Create a .hgignore file with default values</source> + <translation>Создать файл .hgignore со значениями по умолчанию</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation><b>Создать файл .hgignore</b><p>Создать файл .hgignore со значениями по умолчанию.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/> + <source>Create changegroup</source> + <translation>Создать группу изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/> <source>Create changegroup...</source> <translation>Создать группу изменений...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source>Create changegroup file collecting changesets</source> <translation>Создать файл коллекции изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Создать группу изменений</b><p>Создание файла групп изменений, содержащего выбранные наборы изменений (команда hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Preview changegroup</source> <translation>Просмотр группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Preview changegroup...</source> <translation>Просмотр группы изменений...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Просмотр файла, содержащего коллекцию групп изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Просмотр групп изменений</b><p>Просмотр файла, содержащего коллекцию групп изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1863"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824"/> <source>Apply changegroups...</source> <translation>Применить группу изменений...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source>Apply one or several changegroup files</source> <translation>Применить один или несколько файлов групп изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Применить группы изменений</b><p>Применение одного или нескольких файлов групп изменений, созданных командой 'Создать группу изменений' (команда hg unbundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> <source>Mark as "good"</source> <translation>Пометить как "хорошие"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Mark as "good"...</source> - <translation>Пометить как "хорошие"...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="830"/> - <source>Mark a selectable changeset as good</source> - <translation>Пометить выбранные изменения как "хорошие"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation><b>Пометить как "хорошие"</b><p>Пометить выбранные изменения как "хорошие".</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> - <source>Mark as "bad"</source> - <translation>Пометить как "плохие"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> - <source>Mark as "bad"...</source> - <translation>Пометить как "плохие"...</translation> + <source>Mark as "good"...</source> + <translation>Пометить как "хорошие"...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> - <source>Mark a selectable changeset as bad</source> - <translation>Пометить выбранные изменения как "плохие"</translation> + <source>Mark a selectable changeset as good</source> + <translation>Пометить выбранные изменения как "хорошие"</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> - <translation><b>Пометить как "плохие"</b><p>Пометить выбранные изменения как "плохие".</p></translation> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation><b>Пометить как "хорошие"</b><p>Пометить выбранные изменения как "хорошие".</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> + <source>Mark as "bad"</source> + <translation>Пометить как "плохие"</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> - <source>Skip</source> - <translation>Пропустить</translation> + <source>Mark as "bad"...</source> + <translation>Пометить как "плохие"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> + <source>Mark a selectable changeset as bad</source> + <translation>Пометить выбранные изменения как "плохие"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation><b>Пометить как "плохие"</b><p>Пометить выбранные изменения как "плохие".</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> - <source>Reset</source> - <translation>Сбросить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> - <source>Reset the bisect search data</source> - <translation>Сбросить данные Bisect-поиска</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> - <translation><b>Сбросить</b><p>Сброс данных bisect-поиска.</p></translation> + <source>Skip</source> + <translation>Пропустить</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> - <source>Back out changeset</source> - <translation>Отменить изменения</translation> + <source>Reset</source> + <translation>Сбросить</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> - <source>Back out changes of an earlier changeset</source> - <translation>Отменить предыдущие изменения</translation> + <source>Reset the bisect search data</source> + <translation>Сбросить данные Bisect-поиска</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> - <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> - <translation><b>Отменить изменения</b><p>Отмена предыдущих изменений.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> - <source>Serve project repository</source> - <translation>Автономный сервер репозитория проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> - <source>Serve project repository...</source> - <translation>Автономный сервер репозитория проекта...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> - <source>Serve the project repository</source> - <translation>Запуск автономного сервера репозитория проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> - <source><b>Serve project repository</b><p>This serves the project repository.</p></source> - <translation><b>Автономный сервер репозитория проекта</b><p>Запуск автономного сервера для репозитория проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> - <source>Specials</source> - <translation>Специальные</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> - <source>Changegroup Management</source> - <translation>Управление группами изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359"/> - <source>Bisect</source> - <translation>Поиск ревизии методом деления пополам (bisect)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656"/> - <source>Pull</source> - <translation>Затянуть</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/> - <source>The project should be reread. Do this now?</source> - <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> - <source>Push new branch</source> - <translation>Протолкнуть новую ветвь</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> - <source>Push the current branch of the local project as a new named branch</source> - <translation>Протолкнуть текущую ветвь локального проекта как новую именованную ветвь</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> - <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> - <translation><b>Протолкнуть новую ветвь</b><p>Передать текущую ветвь локального проекта как новую именованную ветвь.</p></translation> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> + <translation><b>Сбросить</b><p>Сброс данных bisect-поиска.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> - <source>Rollback last transaction</source> - <translation>Откатить последнюю транзакцию</translation> + <source>Back out changeset</source> + <translation>Отменить изменения</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <source>Back out changes of an earlier changeset</source> + <translation>Отменить предыдущие изменения</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> + <translation><b>Отменить изменения</b><p>Отмена предыдущих изменений.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <source>Serve project repository</source> + <translation>Автономный сервер репозитория проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <source>Serve project repository...</source> + <translation>Автономный сервер репозитория проекта...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> + <source>Serve the project repository</source> + <translation>Запуск автономного сервера репозитория проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> + <source><b>Serve project repository</b><p>This serves the project repository.</p></source> + <translation><b>Автономный сервер репозитория проекта</b><p>Запуск автономного сервера для репозитория проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/> + <source>Specials</source> + <translation>Специальные</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1362"/> + <source>Changegroup Management</source> + <translation>Управление группами изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1375"/> + <source>Bisect</source> + <translation>Поиск ревизии методом деления пополам (bisect)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1674"/> + <source>Pull</source> + <translation>Затянуть</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/> + <source>The project should be reread. Do this now?</source> + <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Push new branch</source> + <translation>Протолкнуть новую ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/> + <source>Push the current branch of the local project as a new named branch</source> + <translation>Протолкнуть текущую ветвь локального проекта как новую именованную ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> + <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> + <translation><b>Протолкнуть новую ветвь</b><p>Передать текущую ветвь локального проекта как новую именованную ветвь.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> + <source>Rollback last transaction</source> + <translation>Откатить последнюю транзакцию</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> <source>Rollback the last transaction</source> <translation>Откатить последнюю транзакцию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1420"/> <source>Extensions</source> <translation>Плагины</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> - <source>Edit user configuration</source> - <translation>Правка конфигурации пользователя</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> - <source>Edit user configuration...</source> - <translation>Правка конфигурации пользователя...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Show an editor to edit the user configuration file</source> - <translation>Отображение редактора для правки конфигурации пользователя</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation><b>Правка конфигурации пользователя</b><p>Отображение редактора для правки конфигурации пользователя.</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> - <source>Edit repository configuration</source> - <translation>Правка конфигурации репозитория</translation> + <source>Edit user configuration</source> + <translation>Правка конфигурации пользователя</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> - <source>Edit repository configuration...</source> - <translation>Правка конфигурации репозитория...</translation> + <source>Edit user configuration...</source> + <translation>Правка конфигурации пользователя...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> - <source>Show an editor to edit the repository configuration file</source> - <translation>Отображение редактора для правки конфигурации репозитория</translation> + <source>Show an editor to edit the user configuration file</source> + <translation>Отображение редактора для правки конфигурации пользователя</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation><b>Правка конфигурации пользователя</b><p>Отображение редактора для правки конфигурации пользователя.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> + <source>Edit repository configuration</source> + <translation>Правка конфигурации репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> + <source>Edit repository configuration...</source> + <translation>Правка конфигурации репозитория...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <source>Show an editor to edit the repository configuration file</source> + <translation>Отображение редактора для правки конфигурации репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation><b>Правка конфигурации репозитория</b><p>Отображение редактора для правки конфигурации репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/> <source>Show combined configuration settings</source> <translation>Показать обобщенные параметры настройки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/> <source>Show combined configuration settings...</source> <translation>Показать обобщенные параметры настройки...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> <source>Show the combined configuration settings from all configuration files</source> <translation>Показать обобщенные параметры настройки из всех конфигурационных файлов</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation><b>Показать обобщенные параметры настройки</b><p>Отображение объединенных параметров настройки из всех конфигурационных файлов.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> <source>Skip...</source> <translation>Пропустить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Skip a selectable changeset</source> <translation>Пропустить выбранные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation><b>Пропустить</b><p>Пропустить выбранные изменения.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1919"/> <source>Import Patch</source> <translation>Импорт патча</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951"/> <source>Import Patch...</source> <translation>Импорт патча...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> <source>Import a patch from a patch file</source> <translation>Импортировать патч из файла патча</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation><b>Импорт патча</b><p>Импортирование патча из файла патча в проект.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369"/> <source>Patch Management</source> <translation>Управление патчами</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1939"/> <source>Revert Changes</source> <translation>Вернуть изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> <source>Export Patches</source> <translation>Экспорт патчей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> <source>Export Patches...</source> <translation>Экспорт патчей...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> - <source>Export revisions to patch files</source> - <translation>Экспорт ревизий в файлы патчей</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="961"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation><b>Экспорт патчей</b><p>Экспорт ревизий проекта в файл патча.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source>Change Phase</source> - <translation>Изменить фазу</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source>Change Phase...</source> - <translation>Изменить фазу...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> - <source>Change the phase of revisions</source> - <translation>Изменить фазу ревизий</translation> + <source>Export revisions to patch files</source> + <translation>Экспорт ревизий в файлы патчей</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation><b>Экспорт патчей</b><p>Экспорт ревизий проекта в файл патча.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <source>Change Phase</source> + <translation>Изменить фазу</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <source>Change Phase...</source> + <translation>Изменить фазу...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <source>Change the phase of revisions</source> + <translation>Изменить фазу ревизий</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="989"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation><b>Изменить фазу</b><p>Изменение фазы выбранных ревизий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1959"/> <source>Copy Changesets</source> <translation>Копировать наборы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source>Copies changesets from another branch</source> <translation>Копирование в текущую ветвь наборов изменений из другой ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation><b>Копировать наборы изменений</b><p>Копирование в текущую рабочую директорию наборов изменений из другой ветви , сохраняются имя пользователя, дата и описание оригинальных изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> <source>Continue Copying Session</source> <translation>Продолжить сессию копирования</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> <source>Continue the last copying session after conflicts were resolved</source> <translation>Продолжить последнюю сессию копирования после решения конфликтов</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1020"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation><b>Продолжить сессию копирования</b><p>Продолжение последней сессии копирования после решения конфликтов.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1974"/> <source>Copy Changesets (Continue)</source> <translation>Копировать изменения (Continue)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> <source>Conflicts resolved</source> <translation>Решенные конфликты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> <source>Con&flicts resolved</source> <translation>Решенные кон&фликты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source>Mark all conflicts of the local project as resolved</source> <translation>Пометить все конфликты локального проекта как решенные</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation><b>Решенные конфликты</b><p>Пометить все конфликты локального проекта как решенные.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Add...</source> <translation>Добавить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> <source>Add a sub-repository</source> <translation>Добавить субрепозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation><b>Добавить...</b><p>Добавление субрепозитория в проект.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Remove...</source> <translation>Удалить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source>Remove sub-repositories</source> <translation>Удалить субрепозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1080"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation><b>Удалить...</b><p>Удаление субрепозиториев из проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1424"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440"/> <source>Sub-Repository</source> <translation>Субрепозиторий</translation> </message> @@ -36315,32 +36325,32 @@ <translation><b>Показать сводку</b><p>Отображение суммарной информации о статусе рабочей директории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Create unversioned archive</source> <translation>Создать неверсированный архив</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Create unversioned archive...</source> <translation>Создать неверсированный архив...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> <source>Create an unversioned archive from the repository</source> <translation>Создать из репозитория неверсированный архив</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation><b>Создать неверсированный архив...</b><p>Создание из репозитория неверсированного архива.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="917"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation><b>Откат последней транзакции</b><p>Выполняет откат последней транзакции. Транзакции используются для инкапсуляции последствий всех команд, которые создают новые наборы изменений или перемещают существующие наборы изменений в хранилище. Например, следующие команды являются транзакционными, и их последствия могут быть отменены:<ul><li>commit</li><li>import</li><li>pull</li><li>push (текущее хранилище как место назначения)</li><li>unbundle</li></ul></p><p><strong>Эта команда опасна. Пожалуйста, используйте ее с осторожностью.</strong></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1328"/> <source>Administration</source> <translation>Администрирование</translation> </message> @@ -36367,338 +36377,368 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> <source>Cancel uncommitted merge</source> - <translation>Отменить незавершённое слияние</translation> + <translation type="obsolete">Отменить незавершённое слияние</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> <source>Cancel an uncommitted merge and lose all changes</source> - <translation>Отменить незавершённое слияние с потерей всех изменений</translation> + <translation type="obsolete">Отменить незавершённое слияние с потерей всех изменений</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> - <translation><b>Отменить незавершённое слияние</b><p>Отмена незавершённого слияния с потерей всех изменений.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> + <translation type="obsolete"><b>Отменить незавершённое слияние</b><p>Отмена незавершённого слияния с потерей всех изменений.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> <source>List bookmarks</source> <translation>Список закладок</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> <source>List bookmarks...</source> <translation>Список закладок...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/> <source>List bookmarks of the project</source> <translation>Список закладок проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1112"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation><b>Список закладок</b><p>Отображение списка закладок текущего проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> <source>Define bookmark</source> <translation>Определить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> <source>Define bookmark...</source> <translation>Определить закладку...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/> <source>Define a bookmark for the project</source> <translation>Определить закладку проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1127"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation><b>Определить закладку</b><p>Определение закладки текущего проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Delete bookmark</source> <translation>Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Delete bookmark...</source> <translation>Удалить закладку...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/> <source>Delete a bookmark of the project</source> <translation>Удалить закладку проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation><b>Удалить закладку</b><p>Удаление закладки проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Rename bookmark</source> <translation>Переименовать закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Rename bookmark...</source> <translation>Переименовать закладку...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source>Rename a bookmark of the project</source> <translation>Переименовать закладку проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1157"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation><b>Переименовать закладку</b><p>Переименование закладки проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> <source>Move bookmark</source> <translation>Переместить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> <source>Move bookmark...</source> <translation>Переместить закладку...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source>Move a bookmark of the project</source> <translation>Переместить закладку проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1172"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation><b>Переместить закладку</b><p>Перемещение закладки проекта в другую набор изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1180"/> <source>Show incoming bookmarks</source> <translation>Показать входящие закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source>Show a list of incoming bookmarks</source> <translation>Показать список входящих закладок</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1174"/> - <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> - <translation><b>Показать входящие закладки</b><p>Отображение списка новых закладок, доступных в удаленном репозитории.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> - <source>Pull bookmark</source> - <translation>Затянуть закладку</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1188"/> + <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> + <translation><b>Показать входящие закладки</b><p>Отображение списка новых закладок, доступных в удаленном репозитории.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> + <source>Pull bookmark</source> + <translation>Затянуть закладку</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> <source>Pull a bookmark from a remote repository</source> <translation>Затянуть закладку из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1205"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation><b>Затянуть закладку</b><p>Загрузка закладки из удалённого репозитория в локальный.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1229"/> <source>Show outgoing bookmarks</source> <translation>Показать исходящие закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source>Show a list of outgoing bookmarks</source> <translation>Показать список исходящих закладок</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223"/> - <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> - <translation><b>Показать исходящие закладки</b><p>Отображение списка новых закладок, доступных в локальном репозитории.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1232"/> - <source>Push bookmark</source> - <translation>Протолкнуть закладку</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1237"/> + <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> + <translation><b>Показать исходящие закладки</b><p>Отображение списка новых закладок, доступных в локальном репозитории.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1246"/> + <source>Push bookmark</source> + <translation>Протолкнуть закладку</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> <source>Push a bookmark to a remote repository</source> <translation>Протолкнуть закладку в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1254"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation><b>Протолкнуть закладку</b><p>Передача закладки из локального репозитория в удалённый репозиторий.</p></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399"/> + <source>Bookmarks</source> + <translation>Закладки</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1383"/> - <source>Bookmarks</source> - <translation>Закладки</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Tags</source> <translation>Теги</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390"/> <source>Branches</source> <translation>Ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> <source>Re-Merge</source> <translation>Повторить слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation>Повторить слияние всех конфликтующих, нерешенных файлов проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> <source>Show conflicts</source> <translation>Показать конфликты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> <source>Show conflicts...</source> <translation>Показать конфликты...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source>Show a dialog listing all files with conflicts</source> <translation>Отображение диалога перечисления всех файлов, содержащих конфликты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation><b>Показать конфликты</b><p>Отображение диалога перечисления все файлов, содержащих конфликты.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> <source>Conflicts unresolved</source> <translation>Нерешенные конфликты</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> <source>Mark all conflicts of the local project as unresolved</source> <translation>Пометить все конфликты локального проекта как нерешенные</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation><b>Нерешенные конфликты</b><p>Пометить все конфликты локального проекта как нерешенные.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="445"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="459"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation><b>Повторное слияние</b><p>Повторное слияние всех конфликтующих, нерешенных файлов проекта, без учета всех предыдущих попыток слияния.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1528"/> <source>Mercurial</source> <translation>Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> <source>Pull current bookmark</source> <translation>Затянуть текущую закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source>Pull the current bookmark from a remote repository</source> <translation>Затянуть текущую закладку из удаленного репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1221"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation><b>Затянуть текущую закладку</b><p>Затягивание текущей закладки из удаленного репозитория в локальный репозиторий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1262"/> <source>Push current bookmark</source> <translation>Протолкнуть текущую закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1267"/> <source>Push the current bookmark to a remote repository</source> <translation>Протолкнуть текущую закладку в удаленный репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> - <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> - <translation><b>Протолкнуть текущую закладку</b><p>Проталкивание текущей закладки из локального репозитория в удаленный репозиторий.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> - <source>Delete all backups</source> - <translation>Удалить все резервные копии</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> + <translation><b>Протолкнуть текущую закладку</b><p>Проталкивание текущей закладки из локального репозитория в удаленный репозиторий.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1279"/> + <source>Delete all backups</source> + <translation>Удалить все резервные копии</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1284"/> <source>Delete all backup bundles stored in the backup area</source> <translation>Удалить все резервные комплекты, сохраненные в области резервного копирования</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1287"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation><b>Удалить все резервные копии</b><p>Удаление всех резервных комплектов, сохраненных в области резервного копирования репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> - <source>Stop Copying Session</source> - <translation>Остановить сессию копирования</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1018"/> - <source>Stop the interrupted copying session</source> - <translation>Остановить прерванную сессию копирования</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/> - <source>Abort Copying Session</source> - <translation>Отменить сессию копирования</translation> + <source>Stop Copying Session</source> + <translation>Остановить сессию копирования</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> + <source>Stop the interrupted copying session</source> + <translation>Остановить прерванную сессию копирования</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <source>Abort Copying Session</source> + <translation>Отменить сессию копирования</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> <source>Abort the interrupted copying session and rollback</source> <translation>Отменить прерванную сессию копирования и откатить</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> + <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> + <translation><b>Отменить сессию копирования</b><p>Отменить прерванную сессию копирования и откатить к состоянию перед копированием.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1445"/> + <source>Merge Changesets</source> + <translation>Слить наборы изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1988"/> + <source>Copy Changesets (Stop)</source> + <translation>Копировать наборы изменений (Stop)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/> + <source>Copy Changesets (Abort)</source> + <translation>Копировать наборы изменений (Abort)</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> - <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> - <translation><b>Отменить сессию копирования</b><p>Отменить прерванную сессию копирования и откатить к состоянию перед копированием.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1429"/> - <source>Merge Changesets</source> - <translation>Слить наборы изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1964"/> - <source>Copy Changesets (Stop)</source> - <translation>Копировать наборы изменений (Stop)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/> - <source>Copy Changesets (Abort)</source> - <translation>Копировать наборы изменений (Abort)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation><b>Остановить сессию копирования</b><p>Остановить прерванную сессию копирования.</p></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> + <source>Commit Merge</source> + <translation type="unfinished">Фиксировать слияние</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> + <source>Commit a merge.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <source>Abort Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> + <source>Abort an uncommitted merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443"/> + <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -47798,202 +47838,202 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="853"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="854"/> <source>Serial Device Connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="853"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="854"/> <source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="898"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="899"/> <source>Run Script</source> <translation type="unfinished">Выполнить сценарий</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="881"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="882"/> <source>There is no editor open. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="889"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="890"/> <source>The current editor does not contain a script. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="898"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="899"/> <source><p>Cannot run script.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="922"/> <source>Open Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="922"/> <source>Python3 Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="965"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="966"/> <source>Start Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="965"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="966"/> <source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="995"/> <source>Unsaved Chart Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="995"/> <source>The chart contains unsaved data.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/> <source>Start File Manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/> <source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1097"/> <source>Show Version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1100"/> <source>Show Implementation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> <source>Synchronize Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1108"/> <source>Show Device Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1111"/> <source>Show Local Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1339"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1361"/> <source>Compile Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1359"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1381"/> <source>Compile Current Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1132"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1135"/> <source><h3>Device Version Information</h3></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1141"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1144"/> <source>No version information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1143"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1146"/> <source>Device Version Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1166"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1169"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/> <source>Device Implementation Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/> <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> <source><p>The time of the connected device was synchronized with the local time.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1216"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1219"/> <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1224"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1227"/> <source><h3>Device Date and Time</h3><p>{0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1238"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1241"/> <source>Device Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/> <source>Local Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/> <source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/> <source>Error handling device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/> <source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1291"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1313"/> <source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1309"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1331"/> <source>Python Files (*.py);;All Files (*)</source> <translation type="unfinished">Файлы Python (*.py);;Все файлы (*)</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1319"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1341"/> <source>The Python file <b>{0}</b> does not exist. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1329"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1351"/> <source>'mpy-cross' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1352"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> <source>The current editor does not contain a Python file. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -48008,12 +48048,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="978"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="979"/> <source>µPy Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1059"/> <source>µPy Files</source> <translation type="unfinished"></translation> </message> @@ -78725,7 +78765,7 @@ <translation>Показать версии, доступные для загрузки</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3724"/> + <location filename="../UI/UserInterface.py" line="3731"/> <source>Report Bug</source> <translation>Сообщение об ошибке</translation> </message> @@ -78765,7 +78805,7 @@ <translation><b>Послать запрос...</b><p>Отображение диалога создания запроса.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3278"/> + <location filename="../UI/UserInterface.py" line="3285"/> <source>Unittest</source> <translation>Юниттест</translation> </message> @@ -79115,7 +79155,7 @@ <translation><b>Горячие клавиши</b><p>Определите горячие клавиши приложения согласно вашим предпочтениям.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6313"/> + <location filename="../UI/UserInterface.py" line="6320"/> <source>Export Keyboard Shortcuts</source> <translation>Экспорт горячих клавиш</translation> </message> @@ -79136,7 +79176,7 @@ <p>Экспортировать горячие клавиши приложения.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6337"/> + <location filename="../UI/UserInterface.py" line="6344"/> <source>Import Keyboard Shortcuts</source> <translation>Импорт горячих клавиш</translation> </message> @@ -79353,7 +79393,7 @@ <translation>&Окна</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3189"/> + <location filename="../UI/UserInterface.py" line="3196"/> <source>&Toolbars</source> <translation>&Панели инструментов</translation> </message> @@ -79368,331 +79408,331 @@ <translation>Настроить...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3202"/> + <location filename="../UI/UserInterface.py" line="3209"/> <source>&Help</source> <translation>&Справка</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3277"/> + <location filename="../UI/UserInterface.py" line="3284"/> <source>Tools</source> <translation>Инструменты</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3279"/> + <location filename="../UI/UserInterface.py" line="3286"/> <source>Settings</source> <translation>Настройки</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5111"/> + <location filename="../UI/UserInterface.py" line="5118"/> <source>Help</source> <translation>Справка</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3281"/> + <location filename="../UI/UserInterface.py" line="3288"/> <source>Profiles</source> <translation>Профили</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3282"/> + <location filename="../UI/UserInterface.py" line="3289"/> <source>Plugins</source> <translation>Плагины</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3447"/> - <source><p>This part of the status bar displays the current editors language.</p></source> - <translation><p>В этой части строки состояния отображается язык текущего окна редактора.</p></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="3454"/> - <source><p>This part of the status bar displays the current editors encoding.</p></source> - <translation><p>В этой части строки состояния отображается текущая кодировка редактора.</p></translation> + <source><p>This part of the status bar displays the current editors language.</p></source> + <translation><p>В этой части строки состояния отображается язык текущего окна редактора.</p></translation> </message> <message> <location filename="../UI/UserInterface.py" line="3461"/> - <source><p>This part of the status bar displays the current editors eol setting.</p></source> - <translation><p>В этой части строки состояния отображается режим конца строки текущего редактора.</p></translation> + <source><p>This part of the status bar displays the current editors encoding.</p></source> + <translation><p>В этой части строки состояния отображается текущая кодировка редактора.</p></translation> </message> <message> <location filename="../UI/UserInterface.py" line="3468"/> - <source><p>This part of the status bar displays an indication of the current editors files writability.</p></source> - <translation><p>В этой части строки состояния отображается режим ro/rw файла, открытого в редакторе.</p></translation> + <source><p>This part of the status bar displays the current editors eol setting.</p></source> + <translation><p>В этой части строки состояния отображается режим конца строки текущего редактора.</p></translation> </message> <message> <location filename="../UI/UserInterface.py" line="3475"/> - <source><p>This part of the status bar displays the line number of the current editor.</p></source> - <translation><p>В этой части строки состояния отображается номер текущей строки редактора.</p></translation> + <source><p>This part of the status bar displays an indication of the current editors files writability.</p></source> + <translation><p>В этой части строки состояния отображается режим ro/rw файла, открытого в редакторе.</p></translation> </message> <message> <location filename="../UI/UserInterface.py" line="3482"/> + <source><p>This part of the status bar displays the line number of the current editor.</p></source> + <translation><p>В этой части строки состояния отображается номер текущей строки редактора.</p></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="3489"/> <source><p>This part of the status bar displays the cursor position of the current editor.</p></source> <translation><p>В этой части строки состояния отображается текущая позиция курсора в редакторе.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3558"/> + <location filename="../UI/UserInterface.py" line="3565"/> <source>External Tools/{0}</source> <translation>Внешние инструменты/{0}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3664"/> + <location filename="../UI/UserInterface.py" line="3671"/> <source><h3>Version Numbers</h3><table></source> <translation><h3>Номера версий</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7302"/> + <location filename="../UI/UserInterface.py" line="7309"/> <source></table></source> <translation></table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3724"/> + <location filename="../UI/UserInterface.py" line="3731"/> <source>Email address or mail server address is empty. Please configure your Email settings in the Preferences Dialog.</source> <translation>Почтовый адрес или адрес почтового сервера пуст. <p>Настройте параметры вашей электронной почты в диалоге предпочтений.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4009"/> + <location filename="../UI/UserInterface.py" line="4016"/> <source>Restart application</source> <translation>Перезапустить приложение</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4009"/> + <location filename="../UI/UserInterface.py" line="4016"/> <source>The application needs to be restarted. Do it now?</source> <translation>Необходимо перезапустить приложение. Сделать это сейчас?</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4090"/> + <location filename="../UI/UserInterface.py" line="4097"/> <source>Configure Tool Groups ...</source> <translation>Настройка группы инструментов...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4094"/> + <location filename="../UI/UserInterface.py" line="4101"/> <source>Configure current Tool Group ...</source> <translation>Настроить текущую группу инструментов...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4045"/> + <location filename="../UI/UserInterface.py" line="4052"/> <source>&Builtin Tools</source> <translation>&Встроенные инструменты</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4062"/> + <location filename="../UI/UserInterface.py" line="4069"/> <source>&Plugin Tools</source> <translation>Инструменты - &плагины</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4210"/> + <location filename="../UI/UserInterface.py" line="4217"/> <source>&Show all</source> <translation>Показать &всё</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4212"/> + <location filename="../UI/UserInterface.py" line="4219"/> <source>&Hide all</source> <translation>Ск&рыть всё</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5058"/> + <location filename="../UI/UserInterface.py" line="5065"/> <source>Qt 3 support</source> <translation>Поддержка Qt3</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5237"/> + <location filename="../UI/UserInterface.py" line="5244"/> <source>Problem</source> <translation>Проблема</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5237"/> + <location filename="../UI/UserInterface.py" line="5244"/> <source><p>The file <b>{0}</b> does not exist or is zero length.</p></source> <translation><p>Файл <b>{0}</b> либо не существует, либо нулевой длины.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5426"/> + <location filename="../UI/UserInterface.py" line="5433"/> <source>Process Generation Error</source> <translation>Ошибка при запуске процесса</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4961"/> + <location filename="../UI/UserInterface.py" line="4968"/> <source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить Qt-Designer.<br>Убедитесь, что он доступен в <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5030"/> + <location filename="../UI/UserInterface.py" line="5037"/> <source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить Qt-Linguist.<br>Убедитесь, что он доступен в <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5083"/> + <location filename="../UI/UserInterface.py" line="5090"/> <source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить Qt-Assistant.<br>Убедитесь, что он доступен в <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5111"/> + <location filename="../UI/UserInterface.py" line="5118"/> <source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source> <translation>В настоящее время просмотрщик пользователя не выбран. Используйте диалог предпочтений для его выбора.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5125"/> + <location filename="../UI/UserInterface.py" line="5132"/> <source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить пользовательский просмотрщик.<br>Убедитесь, что он находится в <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5145"/> + <location filename="../UI/UserInterface.py" line="5152"/> <source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source> <translation><p>Невозможно запустить просмотрщик справки.<br>Убедитесь, что он доступен под именем <b>hh</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5193"/> + <location filename="../UI/UserInterface.py" line="5200"/> <source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить UI Previewer (предпросмотр интерфейсов).<br>Убедитесь, что он находится в <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5248"/> + <location filename="../UI/UserInterface.py" line="5255"/> <source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить Translation Previewer (предпросмотр переводов).<br>Убедитесь, что он находится в <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5269"/> + <location filename="../UI/UserInterface.py" line="5276"/> <source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить SQL браузер.<br>Убедитесь, что он доступен как <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5371"/> + <location filename="../UI/UserInterface.py" line="5378"/> <source>External Tools</source> <translation>Внешние инструменты</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5362"/> + <location filename="../UI/UserInterface.py" line="5369"/> <source>No tool entry found for external tool '{0}' in tool group '{1}'.</source> <translation>Запись для внешнего инструмента '{0}' не найдена в группе инструментов '{1}'.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5371"/> + <location filename="../UI/UserInterface.py" line="5378"/> <source>No toolgroup entry '{0}' found.</source> <translation>Запись для группы инструментов '{0}' не найдена.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5410"/> + <location filename="../UI/UserInterface.py" line="5417"/> <source>Starting process '{0} {1}'. </source> <translation>Запускается процесс '{0} {1}'. </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5426"/> + <location filename="../UI/UserInterface.py" line="5433"/> <source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source> <translation><p>Невозможно запустить инструмент <b>{0}</b>.<br>Убедитесь, что он доступен в <b>{1}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5502"/> + <location filename="../UI/UserInterface.py" line="5509"/> <source>Process '{0}' has exited. </source> <translation>Процесс '{0}' завершен. </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5901"/> + <location filename="../UI/UserInterface.py" line="5908"/> <source>Documentation Missing</source> <translation>Документация отсутствует</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5901"/> + <location filename="../UI/UserInterface.py" line="5908"/> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation><p>Стартовый каталог документации "<b>{0}</b>" не найден.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5884"/> + <location filename="../UI/UserInterface.py" line="5891"/> <source>Documentation</source> <translation>Документация</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5709"/> + <location filename="../UI/UserInterface.py" line="5716"/> <source><p>The PyQt4 documentation starting point has not been configured.</p></source> <translation><p>Стартовый каталог документации PyQt4 не найден.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6337"/> + <location filename="../UI/UserInterface.py" line="6344"/> <source>Keyboard shortcut file (*.e4k)</source> <translation>Файл горячих клавиш (*.e4k)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6506"/> + <location filename="../UI/UserInterface.py" line="6513"/> <source>Save tasks</source> <translation>Сохранить задачи</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6506"/> + <location filename="../UI/UserInterface.py" line="6513"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation><p>Невозможно сохранить файл с задачами: <b>{0}</b></p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6535"/> + <location filename="../UI/UserInterface.py" line="6542"/> <source>Read tasks</source> <translation>Прочитать задачи</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6535"/> + <location filename="../UI/UserInterface.py" line="6542"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл задач: <b>{0}</b></p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6631"/> + <location filename="../UI/UserInterface.py" line="6638"/> <source>Save session</source> <translation>Сохранить сессию</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6569"/> + <location filename="../UI/UserInterface.py" line="6576"/> <source><p>The session file <b>{0}</b> could not be written.</p></source> <translation><p>Невозможно записать файл сессии <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6615"/> + <location filename="../UI/UserInterface.py" line="6622"/> <source>Read session</source> <translation>Загрузить сессию</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6615"/> + <location filename="../UI/UserInterface.py" line="6622"/> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл сессии <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6902"/> <source>Drop Error</source> <translation>Ошибка Drag&&Drop</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6902"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> не является файлом</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7080"/> + <location filename="../UI/UserInterface.py" line="7087"/> <source>&Cancel</source> <translation>От&мена</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7089"/> + <location filename="../UI/UserInterface.py" line="7096"/> <source>Trying host {0}</source> <translation>Подключение к хосту {0}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7245"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Update available</source> <translation>Обновления доступны</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7264"/> + <location filename="../UI/UserInterface.py" line="7271"/> <source>Error during updates check</source> <translation>Ошибка при проверке обновлений</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7264"/> + <location filename="../UI/UserInterface.py" line="7271"/> <source>Could not perform updates check.</source> <translation>Невозможно запустить проверку обновлений.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7288"/> + <location filename="../UI/UserInterface.py" line="7295"/> <source><h3>Available versions</h3><table></source> <translation><h3>Доступные версии</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7339"/> + <location filename="../UI/UserInterface.py" line="7346"/> <source>First time usage</source> <translation>Первое использование</translation> </message> @@ -79732,27 +79772,27 @@ <translation><b>Документация Python 2</b><p>Показать документацию Python 2. Если местонахождение документации не было настроено, то искать в директории <i>doc</i> каталога где находится исполняемый файл Python 2 под Windows и в директории <i>/usr/share/doc/packages/python/html/python-docs-html</i> под UNIX. Местонахождение документации можно задать с помощью переменной среды окружения PYTHON2DOCDIR.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7153"/> + <location filename="../UI/UserInterface.py" line="7160"/> <source>Error getting versions information</source> <translation>Ошибка при получении информации о версии</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7146"/> - <source>The versions information could not be downloaded. Please go online and try again.</source> - <translation>Невозможно загрузить информацию о версии. Пожалуйста попробуйте ещё раз.</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="6103"/> - <source>Open Browser</source> - <translation>Открыть браузер</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="6103"/> - <source>Could not start a web browser</source> - <translation>Невозможно запустить web-браузер</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7153"/> + <source>The versions information could not be downloaded. Please go online and try again.</source> + <translation>Невозможно загрузить информацию о версии. Пожалуйста попробуйте ещё раз.</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="6110"/> + <source>Open Browser</source> + <translation>Открыть браузер</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="6110"/> + <source>Could not start a web browser</source> + <translation>Невозможно запустить web-браузер</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7160"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation>Невозможно загрузить информацию о версии в течении последних 7 дней. Пожалуйста попробуйте ещё раз.</translation> </message> @@ -79838,12 +79878,12 @@ <translation><b>Снимки</b><p>Сделать снимок области экрана.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5339"/> + <location filename="../UI/UserInterface.py" line="5346"/> <source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить программу для создания снимка экрана.<br>Убедитесь что она установлена как <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7358"/> + <location filename="../UI/UserInterface.py" line="7365"/> <source>Select Workspace Directory</source> <translation>Выбор директории рабочей области</translation> </message> @@ -80213,7 +80253,7 @@ <translation>Открыть документацию PyQt5</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5771"/> + <location filename="../UI/UserInterface.py" line="5778"/> <source><p>The PyQt5 documentation starting point has not been configured.</p></source> <translation><p>Стартовый каталог документации PyQt5 не задан.</p></translation> </message> @@ -80223,7 +80263,7 @@ <translation><b>Документация Python 3</b><p>Показать документацию Python 3. Если местонахождение документации не было настроено, то искать в директории <i>doc</i> каталога где находится исполняемый файл Python 3 под Windows и в директории <i>/usr/share/doc/packages/python/html/python-docs-html</i> под UNIX. Местонахождение документации можно задать с помощью переменной среды окружения PYTHON3DOCDIR.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7080"/> + <location filename="../UI/UserInterface.py" line="7087"/> <source>%v/%m</source> <translation>%v/%m</translation> </message> @@ -80243,7 +80283,7 @@ <translation><b>Показать журнал ошибок...</b><p>Показать журнал ошибок.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7084"/> + <location filename="../UI/UserInterface.py" line="7091"/> <source>Version Check</source> <translation>Проверка версии</translation> </message> @@ -80313,27 +80353,27 @@ <translation><b>Документация eric API</b><p>Показать документацию eric API. Местонахождение документации - каталог Documentation/Source, расположенный в директории инсталляции eric6.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5058"/> + <location filename="../UI/UserInterface.py" line="5065"/> <source>Qt v.3 is not supported by eric6.</source> <translation>eric6 не поддерживает Qt3.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7245"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation>На сайте <b>{1}</b> доступно обновление eric6 до версии <b>{0}</b>. Загрузить?</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7257"/> + <location filename="../UI/UserInterface.py" line="7264"/> <source>Eric6 is up to date</source> <translation>Eric6 не требует обновлений</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7257"/> + <location filename="../UI/UserInterface.py" line="7264"/> <source>You are using the latest version of eric6</source> <translation>Вы используете самую последнюю версию eric6</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7339"/> + <location filename="../UI/UserInterface.py" line="7346"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation>Настройка eric6 ещё не выполнена. Сейчас будет запущен диалог конфигурации.</translation> </message> @@ -80343,17 +80383,17 @@ <translation>Генерация панели инструментов...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4065"/> + <location filename="../UI/UserInterface.py" line="4072"/> <source>&User Tools</source> <translation>&Инструменты пользователя</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4137"/> + <location filename="../UI/UserInterface.py" line="4144"/> <source>No User Tools Configured</source> <translation>Инструменты пользователя не сконфигурированы</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7100"/> + <location filename="../UI/UserInterface.py" line="7107"/> <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> <translation>Невозможно загрузить информацию о версии потому что вы <b>не в сети</b>. Пожалуйста, подключитесь к интернету и повторите попытку.</translation> </message> @@ -80398,7 +80438,7 @@ <translation><b>Сохранить сессию...</b><p>Позволяет сохранить текущую сессию на диск. Открывается диалог для выбора имени файла.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6653"/> + <location filename="../UI/UserInterface.py" line="6660"/> <source>Load session</source> <translation>Загрузить сессию</translation> </message> @@ -80413,17 +80453,17 @@ <translation><b>Загрузить сессию...</b><p>Позволяет загрузить сессию, ранее сохраненную на диске. Открывается диалог для выбора имени файла.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6653"/> + <location filename="../UI/UserInterface.py" line="6660"/> <source>eric6 Session Files (*.e5s)</source> <translation>Файлы сессии eric6 (*.e5s)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6700"/> + <location filename="../UI/UserInterface.py" line="6707"/> <source>Crash Session found!</source> <translation>Обнаружена crash-сессия!</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6700"/> + <location filename="../UI/UserInterface.py" line="6707"/> <source>A session file of a crashed session was found. Shall this session be restored?</source> <translation>Найден файл crashed-сессии. Восстановить эту сессию?</translation> </message> @@ -80438,18 +80478,18 @@ <translation>Инициализация плагинов...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7233"/> + <location filename="../UI/UserInterface.py" line="7240"/> <source>Update Check</source> <translation>Проверка обновлений</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7233"/> + <location filename="../UI/UserInterface.py" line="7240"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation>Eric установлен непосредственно из исходного кода. Невозможно проверить наличие обновлений.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7223"/> + <location filename="../UI/UserInterface.py" line="7230"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation>Вы используете промежуточный релиз eric6. Возможно на сайте доступна и более свежий стабильный релиз.</translation> </message> @@ -80504,7 +80544,7 @@ <translation><b>Документация PySide2</b><p>Отображение документации PySide2. В зависимости от ваших настроек это может быть отображение справки либо во встроенных средствах просмотра справки Eric-вьюере/web-браузере, либо в Qt Assistant, либо во внешнем web-браузере. </p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5884"/> + <location filename="../UI/UserInterface.py" line="5891"/> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation><p>Просмотр документации PySide{0} не настроен.</p></translation> </message> @@ -80539,22 +80579,22 @@ <translation><b>Конфигуратор Virtualenv</b><p>Открытие диалога для задания всех параметров, необходимых для создания виртуального окружения Python посредством приложений virtualenv или pyvenv.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3128"/> + <location filename="../UI/UserInterface.py" line="3135"/> <source>Left Side</source> <translation>Левая панель</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3144"/> + <location filename="../UI/UserInterface.py" line="3151"/> <source>Bottom Side</source> <translation>Нижняя панель</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3155"/> + <location filename="../UI/UserInterface.py" line="3162"/> <source>Right Side</source> <translation>Правая панель</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3179"/> + <location filename="../UI/UserInterface.py" line="3186"/> <source>Plug-ins</source> <translation>Плагины</translation> </message> @@ -80580,17 +80620,17 @@ <translation><b>Рестарт IDEE</b><p>Перезапуск среды IDE. Любые несохраненные изменения сохраняются в первую очередь. Любая программа Python, находящаяся в процессе отладки, будет остановлена, предпочтения будут записаны на диск.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6058"/> + <location filename="../UI/UserInterface.py" line="6065"/> <source>Start Web Browser</source> <translation>Запуск web-браузера</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6000"/> + <location filename="../UI/UserInterface.py" line="6007"/> <source>The eric6 web browser could not be started.</source> <translation>Невозможно запустить eric6 web-браузер.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6058"/> + <location filename="../UI/UserInterface.py" line="6065"/> <source><p>The eric6 web browser is not started.</p><p>Reason: {0}</p></source> <translation><p>Eric6 web-браузер не запущен.</p><p>Причина: {0}</p></translation> </message> @@ -80605,7 +80645,7 @@ <translation>PyPI</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3493"/> + <location filename="../UI/UserInterface.py" line="3500"/> <source><p>This part of the status bar allows zooming the current editor or shell.</p></source> <translation><p>В этой части строки состояния разрешено масштабирование редактора или оболочки.</p></translation> </message> @@ -80679,6 +80719,11 @@ <source><b>MicroPython</b><p>This switches the input focus to the MicroPython window.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../UI/UserInterface.py" line="3128"/> + <source>Central Park</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name> @@ -90667,24 +90712,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1427"/> <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="2056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <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="2066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <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="1436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1447"/> <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> @@ -90694,24 +90739,24 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Вершина</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <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="2075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <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> @@ -90722,12 +90767,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Закладки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1481"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -90744,14 +90789,14 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Головная ревизия #{0}</b></td><td></td></tr> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation><tr><td><b>Предок #{0}</b></td><td></td></tr>
--- a/eric6/i18n/eric6_tr.ts Fri Aug 23 13:23:22 2019 +0200 +++ b/eric6/i18n/eric6_tr.ts Fri Aug 23 13:23:36 2019 +0200 @@ -6924,7 +6924,7 @@ <message> <location filename="../Debugger/DebugUI.py" line="597"/> <source>&Start</source> - <translation>Ba&şlat</translation> + <translation type="obsolete">Ba&şlat</translation> </message> <message> <location filename="../Debugger/DebugUI.py" line="599"/> @@ -7132,6 +7132,11 @@ <source>No locals available.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Debugger/DebugUI.py" line="597"/> + <source>Sta&rt</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DebugViewer</name> @@ -31198,7 +31203,7 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> @@ -31228,420 +31233,420 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="630"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="691"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="760"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/> <source>Renaming {0}</source> <translation>Yenşden adlandırılıyor {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/> <source>Reverting changes</source> <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1061"/> <source>Merging</source> <translation>Birleştiriliyor</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1361"/> <source>Mercurial command</source> <translation>Mercurial komut</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936"/> <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="1983"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2223"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2377"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2401"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2414"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <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="2576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2544"/> <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="2597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2608"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2647"/> <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="2657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2656"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2687"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2802"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2782"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2550"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <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="2818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2829"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2822"/> <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="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="555"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3426"/> <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="3523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2897"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2938"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2949"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2996"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3052"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3101"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3292"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3280"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> <source>Revert changes</source> <translation type="unfinished">Değişiklikleri başa döndür</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="984"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="995"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3156"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"><p>Dosya <b>{0}</b> okunamıyor.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1787"/> <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/hg.py" line="943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="954"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3689"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/> <source>Delete Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3755"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3797"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3903"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3947"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1098"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/> - <source>Canceling uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3113"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3126"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <source>Aborting uncommitted merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -35376,432 +35381,432 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>Tag in repository</source> <translation>Kaynak havuzu etiketi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>&Tag in repository...</source> <translation>Kaynak havuzu e&tiketi...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> - <source>Tag the local project in the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> - <source>List tags</source> - <translation>Etiketleri listele</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> - <source>List tags...</source> - <translation>Etiketleri listele...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> - <source>List tags of the project</source> + <source>Tag the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>List branches</source> - <translation>Branşlar listesi</translation> + <source>List tags</source> + <translation>Etiketleri listele</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>List branches...</source> - <translation>Branşlar listesi...</translation> + <source>List tags...</source> + <translation>Etiketleri listele...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/> - <source>List branches of the project</source> - <translation>Prosenin branşlar listesi</translation> + <source>List tags of the project</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Branş listesi</b><p>Bu listeler prosenin branş listeleridir.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> - <source>Create branch</source> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <source>List branches</source> + <translation>Branşlar listesi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <source>List branches...</source> + <translation>Branşlar listesi...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> + <source>List branches of the project</source> + <translation>Prosenin branşlar listesi</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Branş listesi</b><p>Bu listeler prosenin branş listeleridir.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> + <source>Create branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Create &branch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/> <source>Create a new branch for the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> <source>Close branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> - <source>Close the current branch of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> - <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> - <source>Show current branch</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> - <source>Show the current branch of the project</source> + <source>Close the current branch of the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <source>Show current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> + <source>Show the current branch of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source>Switch</source> <translation>Değiştirmek</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source>S&witch...</source> <translation>Deği&ştirmek...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source>Switch the working directory to another revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> - <source>Cleanup</source> - <translation>Temizle</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> - <source>Cleanu&p</source> - <translation>Temi&zle</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source>Cleanup the local project</source> - <translation>Yerel projeyi temizle</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Temizle</b><p>Bu yerel projeyi sıfırlar.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source>Execute command</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source>E&xecute command...</source> - <translation type="unfinished"></translation> + <source>Cleanup</source> + <translation>Temizle</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> + <source>Cleanu&p</source> + <translation>Temi&zle</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> - <source>Execute an arbitrary Mercurial command</source> - <translation type="unfinished"></translation> + <source>Cleanup the local project</source> + <translation>Yerel projeyi temizle</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Temizle</b><p>Bu yerel projeyi sıfırlar.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source>Execute command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source>E&xecute command...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> + <source>Execute an arbitrary Mercurial command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source>Configure</source> <translation>Yapılandırma</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source>Configure...</source> <translation>Ayarlanıyor...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> - <source>Show paths...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> - <source>Show the aliases for remote repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> - <source>Verify repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> - <source>Verify repository...</source> + <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> - <source>Verify the integrity of the repository</source> + <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Recover</source> + <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Recover...</source> + <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> - <source>Recover from an interrupted transaction</source> + <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> - <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> - <source>Identify</source> + <source>Recover</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> - <source>Identify...</source> + <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> - <source>Identify the project directory</source> + <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> - <source><b>Identify</b><p>This identifies the project directory.</p></source> + <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> - <source>Create .hgignore</source> + <source>Identify</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> + <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> - <source>Create a .hgignore file with default values</source> + <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <source>Create .hgignore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/> <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1863"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Mark as "good"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Mark as "good"...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="830"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> - <source>Mark as "bad"</source> + <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> - <source>Mark as "bad"...</source> + <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> - <source>Mark a selectable changeset as bad</source> + <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> + <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> - <source>Skip</source> - <translation>Atla</translation> + <source>Mark as "bad"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> + <source>Mark a selectable changeset as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> - <source>Reset</source> - <translation>Başadön</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> - <source>Reset the bisect search data</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> - <translation type="unfinished"></translation> + <source>Skip</source> + <translation>Atla</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> - <source>Back out changeset</source> - <translation type="unfinished"></translation> + <source>Reset</source> + <translation>Başadön</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> - <source>Back out changes of an earlier changeset</source> + <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> + <source>Back out changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <source>Back out changes of an earlier changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1362"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1375"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -35821,312 +35826,312 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> - <source>Serve project repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> - <source>Serve the project repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> - <source><b>Serve project repository</b><p>This serves the project repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> - <source>Specials</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656"/> - <source>Pull</source> - <translation>Çekmek</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/> - <source>The project should be reread. Do this now?</source> - <translation>Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> - <source>Push new branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> - <source>Push the current branch of the local project as a new named branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> - <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> - <source>Rollback last transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> - <source>Rollback the last transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> - <source>Extensions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> - <source>Edit user configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> - <source>Edit user configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Show an editor to edit the user configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> - <source>Edit repository configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> - <source>Show an editor to edit the repository configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> - <source>Show the combined configuration settings from all configuration files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> - <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> - <source>Skip...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> - <source>Skip a selectable changeset</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> - <source><b>Skip</b><p>This skips a selectable changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1895"/> - <source>Import Patch</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> - <source>Import Patch...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> - <source>Import a patch from a patch file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> - <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <source>Serve project repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> + <source>Serve the project repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> + <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/> + <source>Specials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1674"/> + <source>Pull</source> + <translation>Çekmek</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/> + <source>The project should be reread. Do this now?</source> + <translation>Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Push new branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/> + <source>Push the current branch of the local project as a new named branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> + <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> + <source>Rollback last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> + <source>Rollback the last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1420"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <source>Show an editor to edit the user configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <source>Show an editor to edit the repository configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Show the combined configuration settings from all configuration files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <source>Skip...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <source>Skip a selectable changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <source><b>Skip</b><p>This skips a selectable changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1919"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1939"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> - <source>Export revisions to patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="961"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source>Change Phase...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> - <source>Change the phase of revisions</source> + <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <source>Change Phase...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="989"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1959"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1020"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1974"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> <source>Conflicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> <source>Con&flicts resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Add</source> <translation type="unfinished">Ekle</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Add...</source> <translation type="unfinished">Ekle...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Remove</source> <translation type="unfinished">Kaldır</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1080"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1424"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -36156,32 +36161,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="917"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1328"/> <source>Administration</source> <translation type="unfinished"></translation> </message> @@ -36206,340 +36211,355 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> - <source>Cancel uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> - <source>Cancel an uncommitted merge and lose all changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> <source>List bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> <source>List bookmarks...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/> <source>List bookmarks of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1112"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/> <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1127"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/> <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Rename bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Rename bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source>Rename a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1157"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> <source>Move bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> <source>Move bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1172"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1180"/> <source>Show incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1174"/> - <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> - <source>Pull bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1188"/> + <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> + <source>Pull bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1205"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1229"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223"/> - <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1232"/> - <source>Push bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1237"/> + <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1246"/> + <source>Push bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1254"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399"/> + <source>Bookmarks</source> + <translation type="unfinished">Yerimleri</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1383"/> - <source>Bookmarks</source> - <translation type="unfinished">Yerimleri</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> <source>Show conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> <source>Show conflicts...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="445"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="459"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1528"/> <source>Mercurial</source> <translation type="unfinished">Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1221"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1262"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1267"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> - <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> - <source>Delete all backups</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1279"/> + <source>Delete all backups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1284"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1287"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> - <source>Stop Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1018"/> - <source>Stop the interrupted copying session</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/> - <source>Abort Copying Session</source> + <source>Stop Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> + <source>Stop the interrupted copying session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <source>Abort Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> <source>Abort the interrupted copying session and rollback</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> + <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1445"/> + <source>Merge Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1988"/> + <source>Copy Changesets (Stop)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/> + <source>Copy Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> - <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1429"/> - <source>Merge Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1964"/> - <source>Copy Changesets (Stop)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/> - <source>Copy Changesets (Abort)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> + <source>Commit Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> + <source>Commit a merge.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <source>Abort Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> + <source>Abort an uncommitted merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443"/> + <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -47701,202 +47721,202 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="853"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="854"/> <source>Serial Device Connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="853"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="854"/> <source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="898"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="899"/> <source>Run Script</source> <translation type="unfinished">Betiği Çalıştır</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="881"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="882"/> <source>There is no editor open. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="889"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="890"/> <source>The current editor does not contain a script. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="898"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="899"/> <source><p>Cannot run script.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="922"/> <source>Open Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="922"/> <source>Python3 Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="965"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="966"/> <source>Start Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="965"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="966"/> <source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="995"/> <source>Unsaved Chart Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="995"/> <source>The chart contains unsaved data.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/> <source>Start File Manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/> <source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1097"/> <source>Show Version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1100"/> <source>Show Implementation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> <source>Synchronize Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1108"/> <source>Show Device Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1111"/> <source>Show Local Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1339"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1361"/> <source>Compile Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1359"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1381"/> <source>Compile Current Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1132"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1135"/> <source><h3>Device Version Information</h3></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1141"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1144"/> <source>No version information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1143"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1146"/> <source>Device Version Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1166"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1169"/> <source>unknown</source> <translation type="unfinished">bilinmeyen</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/> <source>Device Implementation Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/> <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> <source><p>The time of the connected device was synchronized with the local time.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1216"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1219"/> <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1224"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1227"/> <source><h3>Device Date and Time</h3><p>{0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1238"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1241"/> <source>Device Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/> <source>Local Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/> <source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/> <source>Error handling device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/> <source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1291"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1313"/> <source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1309"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1331"/> <source>Python Files (*.py);;All Files (*)</source> <translation type="unfinished">Python Dosyaları (*.py);;Tüm Dosyalar (*)</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1319"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1341"/> <source>The Python file <b>{0}</b> does not exist. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1329"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1351"/> <source>'mpy-cross' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1352"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> <source>The current editor does not contain a Python file. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -47911,12 +47931,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="978"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="979"/> <source>µPy Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1059"/> <source>µPy Files</source> <translation type="unfinished"></translation> </message> @@ -78295,7 +78315,7 @@ <translation>İndirmek için mümkün olan sürümü göster</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3724"/> + <location filename="../UI/UserInterface.py" line="3731"/> <source>Report Bug</source> <translation>Hata Raporu</translation> </message> @@ -78335,7 +78355,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3278"/> + <location filename="../UI/UserInterface.py" line="3285"/> <source>Unittest</source> <translation>Birimtest</translation> </message> @@ -78680,7 +78700,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6313"/> + <location filename="../UI/UserInterface.py" line="6320"/> <source>Export Keyboard Shortcuts</source> <translation>Kılavye Kısa Yollarını Dışa Aktar</translation> </message> @@ -78700,7 +78720,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6337"/> + <location filename="../UI/UserInterface.py" line="6344"/> <source>Import Keyboard Shortcuts</source> <translation>Klavye kısayollarını İçe Aktar</translation> </message> @@ -78915,7 +78935,7 @@ <translation>&Pencere</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3189"/> + <location filename="../UI/UserInterface.py" line="3196"/> <source>&Toolbars</source> <translation>&Araççubuğu</translation> </message> @@ -78930,122 +78950,122 @@ <translation>Ayarlanıyor...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3202"/> + <location filename="../UI/UserInterface.py" line="3209"/> <source>&Help</source> <translation>&Yardım</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3277"/> + <location filename="../UI/UserInterface.py" line="3284"/> <source>Tools</source> <translation>Araçlar</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3279"/> + <location filename="../UI/UserInterface.py" line="3286"/> <source>Settings</source> <translation>Ayarlar</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5111"/> + <location filename="../UI/UserInterface.py" line="5118"/> <source>Help</source> <translation>Yardım</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3281"/> + <location filename="../UI/UserInterface.py" line="3288"/> <source>Profiles</source> <translation>Kesitler</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3282"/> + <location filename="../UI/UserInterface.py" line="3289"/> <source>Plugins</source> <translation>Eklentiler</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3447"/> - <source><p>This part of the status bar displays the current editors language.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="3454"/> - <source><p>This part of the status bar displays the current editors encoding.</p></source> + <source><p>This part of the status bar displays the current editors language.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../UI/UserInterface.py" line="3461"/> - <source><p>This part of the status bar displays the current editors eol setting.</p></source> + <source><p>This part of the status bar displays the current editors encoding.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../UI/UserInterface.py" line="3468"/> - <source><p>This part of the status bar displays an indication of the current editors files writability.</p></source> + <source><p>This part of the status bar displays the current editors eol setting.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../UI/UserInterface.py" line="3475"/> - <source><p>This part of the status bar displays the line number of the current editor.</p></source> + <source><p>This part of the status bar displays an indication of the current editors files writability.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../UI/UserInterface.py" line="3482"/> + <source><p>This part of the status bar displays the line number of the current editor.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="3489"/> <source><p>This part of the status bar displays the cursor position of the current editor.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3558"/> + <location filename="../UI/UserInterface.py" line="3565"/> <source>External Tools/{0}</source> <translation>Harici Araçlar/{0}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3664"/> + <location filename="../UI/UserInterface.py" line="3671"/> <source><h3>Version Numbers</h3><table></source> <translation><h3>Sürüm Numaraları</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7302"/> + <location filename="../UI/UserInterface.py" line="7309"/> <source></table></source> <translation></table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3724"/> + <location filename="../UI/UserInterface.py" line="3731"/> <source>Email address or mail server address is empty. Please configure your Email settings in the Preferences Dialog.</source> <translation>E-posta adresi veya posta sunucu adresi boş. Lütfen e-posta ayarlarını özellikler diyaloğundan giriniz.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4009"/> + <location filename="../UI/UserInterface.py" line="4016"/> <source>Restart application</source> <translation>Uygulmayı yeniden başlat</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4009"/> + <location filename="../UI/UserInterface.py" line="4016"/> <source>The application needs to be restarted. Do it now?</source> <translation>Uygulama yeniden başlatılmaya ihtiyaç duyuyor. Şimdi yapılsın mı?</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4090"/> + <location filename="../UI/UserInterface.py" line="4097"/> <source>Configure Tool Groups ...</source> <translation>Alet Grupları Ayarlanıyor...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4094"/> + <location filename="../UI/UserInterface.py" line="4101"/> <source>Configure current Tool Group ...</source> <translation>Geçerli alet grubunu ayarla...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4045"/> + <location filename="../UI/UserInterface.py" line="4052"/> <source>&Builtin Tools</source> <translation>Ya&pılandırma Araçları</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4062"/> + <location filename="../UI/UserInterface.py" line="4069"/> <source>&Plugin Tools</source> <translation>Eklen&ti Araçları</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4210"/> + <location filename="../UI/UserInterface.py" line="4217"/> <source>&Show all</source> <translation>Hepsini Gö&ster</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4212"/> + <location filename="../UI/UserInterface.py" line="4219"/> <source>&Hide all</source> <translation>&Hepsini gizle</translation> </message> @@ -79055,204 +79075,204 @@ <translation type="obsolete">Bugeçerli projede tanımlanan ana betik değil. Durduruluyor</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5058"/> + <location filename="../UI/UserInterface.py" line="5065"/> <source>Qt 3 support</source> <translation>Qt3 Desteği</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5237"/> + <location filename="../UI/UserInterface.py" line="5244"/> <source>Problem</source> <translation>Problem</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5237"/> + <location filename="../UI/UserInterface.py" line="5244"/> <source><p>The file <b>{0}</b> does not exist or is zero length.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5426"/> + <location filename="../UI/UserInterface.py" line="5433"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4961"/> + <location filename="../UI/UserInterface.py" line="4968"/> <source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5030"/> + <location filename="../UI/UserInterface.py" line="5037"/> <source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5083"/> + <location filename="../UI/UserInterface.py" line="5090"/> <source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5111"/> + <location filename="../UI/UserInterface.py" line="5118"/> <source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source> <translation>Hali hazırda kullanıcı göstericisi seçilmedi. Lütfen .birini belirlemek için özellikler diyaloğunu kullanının.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5125"/> + <location filename="../UI/UserInterface.py" line="5132"/> <source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5145"/> + <location filename="../UI/UserInterface.py" line="5152"/> <source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5193"/> + <location filename="../UI/UserInterface.py" line="5200"/> <source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5248"/> + <location filename="../UI/UserInterface.py" line="5255"/> <source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5269"/> + <location filename="../UI/UserInterface.py" line="5276"/> <source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5371"/> + <location filename="../UI/UserInterface.py" line="5378"/> <source>External Tools</source> <translation>Harici Araçlar</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5362"/> + <location filename="../UI/UserInterface.py" line="5369"/> <source>No tool entry found for external tool '{0}' in tool group '{1}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5371"/> + <location filename="../UI/UserInterface.py" line="5378"/> <source>No toolgroup entry '{0}' found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5410"/> + <location filename="../UI/UserInterface.py" line="5417"/> <source>Starting process '{0} {1}'. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5426"/> + <location filename="../UI/UserInterface.py" line="5433"/> <source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5502"/> + <location filename="../UI/UserInterface.py" line="5509"/> <source>Process '{0}' has exited. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5901"/> + <location filename="../UI/UserInterface.py" line="5908"/> <source>Documentation Missing</source> <translation>Eksik Belgeleme</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5901"/> + <location filename="../UI/UserInterface.py" line="5908"/> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5884"/> + <location filename="../UI/UserInterface.py" line="5891"/> <source>Documentation</source> <translation>Belgeleme</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5709"/> + <location filename="../UI/UserInterface.py" line="5716"/> <source><p>The PyQt4 documentation starting point has not been configured.</p></source> <translation><p>PyQt4 Belgelerinin başlama noktası ayarlanmamış.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6506"/> + <location filename="../UI/UserInterface.py" line="6513"/> <source>Save tasks</source> <translation>Görevleri kaydet</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6506"/> + <location filename="../UI/UserInterface.py" line="6513"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6535"/> + <location filename="../UI/UserInterface.py" line="6542"/> <source>Read tasks</source> <translation>Görevler Okunuyor</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6535"/> + <location filename="../UI/UserInterface.py" line="6542"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6631"/> + <location filename="../UI/UserInterface.py" line="6638"/> <source>Save session</source> <translation>Oturumu kaydet</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6569"/> + <location filename="../UI/UserInterface.py" line="6576"/> <source><p>The session file <b>{0}</b> could not be written.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6615"/> + <location filename="../UI/UserInterface.py" line="6622"/> <source>Read session</source> <translation>Oturumu oku</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6615"/> + <location filename="../UI/UserInterface.py" line="6622"/> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6902"/> <source>Drop Error</source> <translation>Düşme hatası</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6902"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> bir dosya değil.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7080"/> + <location filename="../UI/UserInterface.py" line="7087"/> <source>&Cancel</source> <translation>&Vazgeç</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7089"/> + <location filename="../UI/UserInterface.py" line="7096"/> <source>Trying host {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7245"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Update available</source> <translation>Güncelleme mümkün değil</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7264"/> + <location filename="../UI/UserInterface.py" line="7271"/> <source>Error during updates check</source> <translation>Güncellemeleri kontrol esnasında hata</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7264"/> + <location filename="../UI/UserInterface.py" line="7271"/> <source>Could not perform updates check.</source> <translation>Güncellemelere ulaşamıyorum.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7288"/> + <location filename="../UI/UserInterface.py" line="7295"/> <source><h3>Available versions</h3><table></source> <translation><h3>Mümkün sürümler</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7339"/> + <location filename="../UI/UserInterface.py" line="7346"/> <source>First time usage</source> <translation>İlk kullanım</translation> </message> @@ -79312,32 +79332,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6337"/> + <location filename="../UI/UserInterface.py" line="6344"/> <source>Keyboard shortcut file (*.e4k)</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../UI/UserInterface.py" line="7160"/> + <source>Error getting versions information</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../UI/UserInterface.py" line="7153"/> - <source>Error getting versions information</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="7146"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6103"/> + <location filename="../UI/UserInterface.py" line="6110"/> <source>Open Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6103"/> + <location filename="../UI/UserInterface.py" line="6110"/> <source>Could not start a web browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7153"/> + <location filename="../UI/UserInterface.py" line="7160"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -79423,12 +79443,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5339"/> + <location filename="../UI/UserInterface.py" line="5346"/> <source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7358"/> + <location filename="../UI/UserInterface.py" line="7365"/> <source>Select Workspace Directory</source> <translation type="unfinished"></translation> </message> @@ -79793,7 +79813,7 @@ <translation type="unfinished">PyQt4 Begelerini aç {5 ?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5771"/> + <location filename="../UI/UserInterface.py" line="5778"/> <source><p>The PyQt5 documentation starting point has not been configured.</p></source> <translation type="unfinished"><p>PyQt4 Belgelerinin başlama noktası ayarlanmamış.</p> {5 ?}</translation> </message> @@ -79803,7 +79823,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7080"/> + <location filename="../UI/UserInterface.py" line="7087"/> <source>%v/%m</source> <translation type="unfinished"></translation> </message> @@ -79823,7 +79843,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7084"/> + <location filename="../UI/UserInterface.py" line="7091"/> <source>Version Check</source> <translation type="unfinished"></translation> </message> @@ -79893,27 +79913,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5058"/> + <location filename="../UI/UserInterface.py" line="5065"/> <source>Qt v.3 is not supported by eric6.</source> <translation type="unfinished">Qt v.3 eric5 tarafından desteklenmiyor. {3 ?} {6.?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7245"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7257"/> + <location filename="../UI/UserInterface.py" line="7264"/> <source>Eric6 is up to date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7257"/> + <location filename="../UI/UserInterface.py" line="7264"/> <source>You are using the latest version of eric6</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7339"/> + <location filename="../UI/UserInterface.py" line="7346"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation type="unfinished">Eric5 henüz ayarlanmadı. Ayarlar Diyaloğu başlatılıyor. {6 ?}</translation> </message> @@ -79923,17 +79943,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4065"/> + <location filename="../UI/UserInterface.py" line="4072"/> <source>&User Tools</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4137"/> + <location filename="../UI/UserInterface.py" line="4144"/> <source>No User Tools Configured</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7100"/> + <location filename="../UI/UserInterface.py" line="7107"/> <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> <translation type="unfinished"></translation> </message> @@ -79978,7 +79998,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6653"/> + <location filename="../UI/UserInterface.py" line="6660"/> <source>Load session</source> <translation type="unfinished">Oturum yükleniyor</translation> </message> @@ -79993,17 +80013,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6653"/> + <location filename="../UI/UserInterface.py" line="6660"/> <source>eric6 Session Files (*.e5s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6700"/> + <location filename="../UI/UserInterface.py" line="6707"/> <source>Crash Session found!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6700"/> + <location filename="../UI/UserInterface.py" line="6707"/> <source>A session file of a crashed session was found. Shall this session be restored?</source> <translation type="unfinished"></translation> </message> @@ -80018,17 +80038,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7233"/> + <location filename="../UI/UserInterface.py" line="7240"/> <source>Update Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7233"/> + <location filename="../UI/UserInterface.py" line="7240"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7223"/> + <location filename="../UI/UserInterface.py" line="7230"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation type="unfinished"></translation> </message> @@ -80083,7 +80103,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5884"/> + <location filename="../UI/UserInterface.py" line="5891"/> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> @@ -80118,22 +80138,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3128"/> + <location filename="../UI/UserInterface.py" line="3135"/> <source>Left Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3144"/> + <location filename="../UI/UserInterface.py" line="3151"/> <source>Bottom Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3155"/> + <location filename="../UI/UserInterface.py" line="3162"/> <source>Right Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3179"/> + <location filename="../UI/UserInterface.py" line="3186"/> <source>Plug-ins</source> <translation type="unfinished"></translation> </message> @@ -80159,17 +80179,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6058"/> + <location filename="../UI/UserInterface.py" line="6065"/> <source>Start Web Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6000"/> + <location filename="../UI/UserInterface.py" line="6007"/> <source>The eric6 web browser could not be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6058"/> + <location filename="../UI/UserInterface.py" line="6065"/> <source><p>The eric6 web browser is not started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -80184,7 +80204,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3493"/> + <location filename="../UI/UserInterface.py" line="3500"/> <source><p>This part of the status bar allows zooming the current editor or shell.</p></source> <translation type="unfinished"></translation> </message> @@ -80258,6 +80278,11 @@ <source><b>MicroPython</b><p>This switches the input focus to the MicroPython window.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../UI/UserInterface.py" line="3128"/> + <source>Central Park</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name> @@ -90188,24 +90213,24 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1427"/> <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="2056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <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="2066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <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="1436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1447"/> <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> @@ -90214,23 +90239,23 @@ <tr><td><b>Teslim zamnanı</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/> <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="2051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <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="2075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <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> @@ -90241,12 +90266,12 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1481"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -90257,13 +90282,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
--- a/eric6/i18n/eric6_zh_CN.ts Fri Aug 23 13:23:22 2019 +0200 +++ b/eric6/i18n/eric6_zh_CN.ts Fri Aug 23 13:23:36 2019 +0200 @@ -6911,7 +6911,7 @@ <message> <location filename="../Debugger/DebugUI.py" line="597"/> <source>&Start</source> - <translation>开始(&S)</translation> + <translation type="obsolete">开始(&S)</translation> </message> <message> <location filename="../Debugger/DebugUI.py" line="599"/> @@ -7131,6 +7131,11 @@ <source>No locals available.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Debugger/DebugUI.py" line="597"/> + <source>Sta&rt</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DebugViewer</name> @@ -31212,7 +31217,7 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1773"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> <source>The hg process did not finish within 30s.</source> <translation>hg 进程没有在 30 秒内结束。</translation> </message> @@ -31242,420 +31247,420 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="630"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="641"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="691"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="760"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="821"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1010"/> <source>Reverting changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1050"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1061"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1361"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1925"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1936"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1983"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2194"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2352"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2377"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2390"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2401"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2414"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2656"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2223"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2234"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2587"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2676"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2687"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2705"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2716"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2597"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2608"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2449"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> <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="2737"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2748"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2544"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2636"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2647"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2802"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2782"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2550"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/> <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="2818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2829"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2822"/> <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="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="555"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3426"/> <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="3523"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3571"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2897"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2938"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2949"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2985"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2996"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3052"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3101"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3292"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3229"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3240"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3311"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3280"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> <source>Commit Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> <source>Revert changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="984"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="995"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="993"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1004"/> <source>Do you really want to revert all changes of the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3156"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1855"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>文件 <b>{0}</b> 无法读取。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1776"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1787"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">进程 {0} 无法启动。请保证它处在搜索路径中。</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="943"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="954"/> <source>Tagging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2201"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2212"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> <source>Current branch tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3689"/> <source>Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/> <source>Delete Bookmark</source> <translation type="unfinished">删除书签</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3663"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3711"/> <source>Select the bookmark to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3722"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3755"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3749"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3797"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/> <source>Pull Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3843"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3891"/> <source>Select the bookmark to be pulled:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3903"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/> <source>Push Bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3887"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3935"/> <source>Select the bookmark to be push:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3899"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3947"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1087"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1098"/> <source>Do you really want to re-merge these files or directories?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1096"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1107"/> <source>Do you really want to re-merge the project?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1112"/> <source>Re-Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <source>Marking as 'unresolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/> <source>Marking as 'resolved'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/> <source>Delete All Backups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3162"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3173"/> <source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2161"/> - <source>Canceling uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3113"/> <source>Copy Changesets (Stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3126"/> <source>Copy Changesets (Abort)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> + <source>Aborting uncommitted merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -35394,432 +35399,432 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>Tag in repository</source> <translation>在仓库中标记</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="512"/> <source>&Tag in repository...</source> <translation>在仓库中标记(&T)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="503"/> - <source>Tag the local project in the repository</source> - <translation>在仓库中标记本地项目</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>在仓库中标记</b><p>在仓库中标记本地项目。</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> - <source>List tags</source> - <translation>列出标签</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> - <source>List tags...</source> - <translation>列出标签…</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> - <source>List tags of the project</source> - <translation>列出项目的标签</translation> + <source>Tag the local project in the repository</source> + <translation>在仓库中标记本地项目</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>列出标签</b><p>列出项目的标签。</p></translation> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>在仓库中标记</b><p>在仓库中标记本地项目。</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>List branches</source> - <translation>列出分支</translation> + <source>List tags</source> + <translation>列出标签</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>List branches...</source> - <translation>列出分支…</translation> + <source>List tags...</source> + <translation>列出标签…</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="531"/> - <source>List branches of the project</source> - <translation>列出项目的分支</translation> + <source>List tags of the project</source> + <translation>列出项目的标签</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>列出分支</b><p>列出项目的分支。</p></translation> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>列出标签</b><p>列出项目的标签。</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> - <source>Create branch</source> - <translation>创建分支</translation> + <source>List branches</source> + <translation>列出分支</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> + <source>List branches...</source> + <translation>列出分支…</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="545"/> + <source>List branches of the project</source> + <translation>列出项目的分支</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>列出分支</b><p>列出项目的分支。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> + <source>Create branch</source> + <translation>创建分支</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="555"/> <source>Create &branch...</source> <translation>创建分支(&B)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="560"/> <source>Create a new branch for the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="563"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> <source>Close branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> <source>Close the current branch of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="582"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source>Switch</source> <translation type="unfinished">转换</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> <source>S&witch...</source> <translation type="unfinished">转换(&w)…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="622"/> <source>Switch the working directory to another revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="625"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> - <source>Cleanup</source> - <translation type="unfinished">清除</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> - <source>Cleanu&p</source> - <translation type="unfinished">清除(&P)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source>Cleanup the local project</source> - <translation type="unfinished">清除本地项目</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation type="unfinished"><b>清除</b><p>执行对本地项目的清除。</p></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source>Execute command</source> - <translation type="unfinished">执行命令</translation> + <source>Cleanup</source> + <translation type="unfinished">清除</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="633"/> - <source>E&xecute command...</source> - <translation>执行命令(&X)…</translation> + <source>Cleanu&p</source> + <translation type="unfinished">清除(&P)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="637"/> - <source>Execute an arbitrary Mercurial command</source> - <translation type="unfinished"></translation> + <source>Cleanup the local project</source> + <translation type="unfinished">清除本地项目</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation type="unfinished"><b>清除</b><p>执行对本地项目的清除。</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source>Execute command</source> + <translation type="unfinished">执行命令</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source>E&xecute command...</source> + <translation>执行命令(&X)…</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> + <source>Execute an arbitrary Mercurial command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source>Configure</source> <translation>配置</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="648"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="662"/> <source>Configure...</source> <translation>配置…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> - <source>Show paths</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> - <source>Show paths...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> - <source>Show the aliases for remote repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> - <source>Verify repository</source> + <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="722"/> - <source>Verify repository...</source> + <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> - <source>Verify the integrity of the repository</source> + <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Recover</source> + <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Recover...</source> + <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> - <source>Recover from an interrupted transaction</source> + <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <source>Recover</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <source>Recover...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <source>Recover from an interrupted transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> - <source>Create .hgignore</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> - <source>Create a .hgignore file with default values</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <source>Create .hgignore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="785"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="792"/> <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1839"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1863"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1362"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> <source>Show current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source>Show the current branch of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="596"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="610"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Mark as "good"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="830"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> - <source>Mark as "bad"</source> + <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="844"/> - <source>Mark a selectable changeset as bad</source> + <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> - <source>Skip</source> - <translation type="unfinished">跳过</translation> + <source>Mark as "bad"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> + <source>Mark a selectable changeset as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <source>Skip</source> + <translation type="unfinished">跳过</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> <source>Reset</source> <translation type="unfinished">重置</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1359"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1375"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Mark as "good"...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="808"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="764"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="757"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="771"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="799"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="802"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> @@ -35839,312 +35844,312 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/> <source>Specials</source> <translation type="unfinished">特殊</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> - <source>Serve project repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="927"/> - <source>Serve the project repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="930"/> - <source><b>Serve project repository</b><p>This serves the project repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1656"/> - <source>Pull</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/> - <source>The project should be reread. Do this now?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> - <source>Push new branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> - <source>Push the current branch of the local project as a new named branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> - <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> - <source>Rollback last transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> - <source>Rollback the last transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1404"/> - <source>Extensions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> - <source>Edit user configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="663"/> - <source>Edit user configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Show an editor to edit the user configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> - <source>Edit repository configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> - <source>Show an editor to edit the repository configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="692"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> - <source>Show the combined configuration settings from all configuration files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> - <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> - <source>Skip...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> - <source>Skip a selectable changeset</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="861"/> - <source><b>Skip</b><p>This skips a selectable changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1895"/> - <source>Import Patch</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <source>Serve project repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="941"/> + <source>Serve the project repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> + <source><b>Serve project repository</b><p>This serves the project repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1674"/> + <source>Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Push new branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="576"/> + <source>Push the current branch of the local project as a new named branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> + <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> + <source>Rollback last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/> + <source>Rollback the last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1420"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="677"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <source>Show an editor to edit the user configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="691"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <source>Show an editor to edit the repository configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="706"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Show the combined configuration settings from all configuration files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <source>Skip...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <source>Skip a selectable changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <source><b>Skip</b><p>This skips a selectable changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1919"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="951"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="959"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1369"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1939"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="953"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="967"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> - <source>Export revisions to patch files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="961"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source>Change Phase...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="972"/> - <source>Change the phase of revisions</source> + <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="982"/> + <source>Change Phase...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> + <source>Change the phase of revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="989"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1935"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1959"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1001"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="990"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1004"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1013"/> <source>Continue Copying Session</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1003"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1017"/> <source>Continue the last copying session after conflicts were resolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1006"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1020"/> <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1974"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> <source>Conflicts resolved</source> <translation type="unfinished">冲突已解决</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> <source>Con&flicts resolved</source> <translation type="unfinished">冲突已解决(&F)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="486"/> <source>Mark all conflicts of the local project as resolved</source> <translation type="unfinished">将本地项目的所有冲突标记为已解决状态</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> <translation type="unfinished"><b>冲突已解决</b><p>将本地项目中的所有冲突标记为已解决。</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Add</source> <translation type="unfinished">添加</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> <source>Add...</source> <translation type="unfinished">添加…</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Remove</source> <translation type="unfinished">移除</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1058"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1072"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1080"/> <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1424"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1440"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -36174,32 +36179,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1088"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1079"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1093"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1082"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1096"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="917"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1328"/> <source>Administration</source> <translation type="unfinished"></translation> </message> @@ -36224,340 +36229,355 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> - <source>Cancel uncommitted merge</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> - <source>Cancel an uncommitted merge and lose all changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source><b>Cancel uncommitted merge</b><p>This cancels an uncommitted merge causing all changes to be lost.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> <source>List bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1090"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1104"/> <source>List bookmarks...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1109"/> <source>List bookmarks of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1112"/> <source><b>List bookmarks</b><p>This lists the bookmarks of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> <source>Define bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1119"/> <source>Define bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1124"/> <source>Define a bookmark for the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1113"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1127"/> <source><b>Define bookmark</b><p>This defines a bookmark for the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Delete bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1134"/> <source>Delete bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1139"/> <source>Delete a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1142"/> <source><b>Delete bookmark</b><p>This deletes a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Rename bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1149"/> <source>Rename bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1154"/> <source>Rename a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1143"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1157"/> <source><b>Rename bookmark</b><p>This renames a bookmark of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> <source>Move bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1164"/> <source>Move bookmark...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1169"/> <source>Move a bookmark of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1172"/> <source><b>Move bookmark</b><p>This moves a bookmark of the project to another changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1180"/> <source>Show incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1185"/> <source>Show a list of incoming bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1174"/> - <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1183"/> - <source>Pull bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1188"/> + <source><b>Show incoming bookmarks</b><p>This shows a list of new bookmarks available at the remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> + <source>Pull bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1202"/> <source>Pull a bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1205"/> <source><b>Pull bookmark</b><p>This pulls a bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1215"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1229"/> <source>Show outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1220"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1234"/> <source>Show a list of outgoing bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1223"/> - <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1232"/> - <source>Push bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1237"/> + <source><b>Show outgoing bookmarks</b><p>This shows a list of new bookmarks available at the local repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1246"/> + <source>Push bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1251"/> <source>Push a bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1240"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1254"/> <source><b>Push bookmark</b><p>This pushes a bookmark from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1399"/> + <source>Bookmarks</source> + <translation type="unfinished">书签</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1383"/> - <source>Bookmarks</source> - <translation type="unfinished">书签</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1367"/> <source>Tags</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1390"/> <source>Branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> <source>Re-Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="456"/> <source>Re-Merge all conflicting, unresolved files of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> <source>Show conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> <source>Show conflicts...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source>Show a dialog listing all files with conflicts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> <source><b>Show conflicts</b><p>This shows a dialog listing all files which had or still have conflicts.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="483"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> <source>Conflicts unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> <source>Mark all conflicts of the local project as unresolved</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> <source><b>Conflicts unresolved</b><p>This marks all conflicts of the local project as unresolved.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="445"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="459"/> <source><b>Re-Merge</b><p>This re-merges all conflicting, unresolved files of the project discarding any previous merge attempt.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1511"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1528"/> <source>Mercurial</source> <translation type="unfinished">Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1213"/> <source>Pull current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1218"/> <source>Pull the current bookmark from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1221"/> <source><b>Pull current bookmark</b><p>This pulls the current bookmark from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1262"/> <source>Push current bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1267"/> <source>Push the current bookmark to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> - <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> - <source>Delete all backups</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <source><b>Push current bookmark</b><p>This pushes the current bookmark from the local repository to a remote repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1279"/> + <source>Delete all backups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1284"/> <source>Delete all backup bundles stored in the backup area</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1273"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1287"/> <source><b>Delete all backups</b><p>This deletes all backup bundles stored in the backup area of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1014"/> - <source>Stop Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1018"/> - <source>Stop the interrupted copying session</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1028"/> - <source>Abort Copying Session</source> + <source>Stop Copying Session</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> + <source>Stop the interrupted copying session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1042"/> + <source>Abort Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1046"/> <source>Abort the interrupted copying session and rollback</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/> + <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1445"/> + <source>Merge Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1988"/> + <source>Copy Changesets (Stop)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="2003"/> + <source>Copy Changesets (Abort)</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> - <source><b>Abort Copying Session</b><p>This aborts the interrupted copying session and rollbacks to the state before the copy.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1429"/> - <source>Merge Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1964"/> - <source>Copy Changesets (Stop)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1979"/> - <source>Copy Changesets (Abort)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1021"/> <source><b>Stop Copying Session</b><p>This stops the interrupted copying session.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> + <source>Commit Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> + <source>Commit a merge.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> + <source>Abort Merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> + <source>Abort an uncommitted merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="443"/> + <source><b>Abort uncommitted merge</b><p>This aborts an uncommitted merge causing all changes to be lost.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -47697,202 +47717,202 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="853"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="854"/> <source>Serial Device Connect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="853"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="854"/> <source><p>Cannot connect to device at serial port <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="898"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="899"/> <source>Run Script</source> <translation type="unfinished">运行脚本</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="881"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="882"/> <source>There is no editor open. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="889"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="890"/> <source>The current editor does not contain a script. Abort...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="898"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="899"/> <source><p>Cannot run script.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="922"/> <source>Open Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="921"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="922"/> <source>Python3 Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="965"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="966"/> <source>Start Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="965"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="966"/> <source><p>The Chart cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="995"/> <source>Unsaved Chart Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="994"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="995"/> <source>The chart contains unsaved data.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/> <source>Start File Manager</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1045"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1046"/> <source><p>The File Manager cannot be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1096"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1097"/> <source>Show Version</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1099"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1100"/> <source>Show Implementation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> <source>Synchronize Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1107"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1108"/> <source>Show Device Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1110"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1111"/> <source>Show Local Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1339"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1361"/> <source>Compile Python File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1359"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1381"/> <source>Compile Current Editor</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1132"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1135"/> <source><h3>Device Version Information</h3></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1141"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1144"/> <source>No version information available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1143"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1146"/> <source>Device Version Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1166"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1169"/> <source>unknown</source> <translation type="unfinished">未知</translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/> <source>Device Implementation Information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1170"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1173"/> <source><h3>Device Implementation Information</h3><p>This device contains <b>{0} {1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1194"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1197"/> <source><p>The time of the connected device was synchronized with the local time.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1216"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1219"/> <source><h3>Device Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1224"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1227"/> <source><h3>Device Date and Time</h3><p>{0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1238"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1241"/> <source>Device Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/> <source>Local Date and Time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1251"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1254"/> <source><h3>Local Date and Time</h3><table><tr><td><b>Date</b></td><td>{0}</td></tr><tr><td><b>Time</b></td><td>{1}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/> <source>Error handling device</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1271"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1274"/> <source><p>There was an error communicating with the connected device.</p><p>Method: {0}</p><p>Message: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1291"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1313"/> <source>The MicroPython cross compiler <b>mpy-cross</b> cannot be found. Ensure it is in the search path or configure it on the MicroPython configuration page.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1309"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1331"/> <source>Python Files (*.py);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1319"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1341"/> <source>The Python file <b>{0}</b> does not exist. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1329"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1351"/> <source>'mpy-cross' Output</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1352"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1374"/> <source>The current editor does not contain a Python file. Aborting...</source> <translation type="unfinished"></translation> </message> @@ -47907,12 +47927,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="978"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="979"/> <source>µPy Chart</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MicroPython/MicroPythonWidget.py" line="1058"/> + <location filename="../MicroPython/MicroPythonWidget.py" line="1059"/> <source>µPy Files</source> <translation type="unfinished"></translation> </message> @@ -78435,7 +78455,7 @@ <translation>显示可以下载的版本</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3724"/> + <location filename="../UI/UserInterface.py" line="3731"/> <source>Report Bug</source> <translation>报告错误</translation> </message> @@ -78475,7 +78495,7 @@ <translation><b>请求功能…</b><p>打开一个对话框并发送一个功能请求。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3278"/> + <location filename="../UI/UserInterface.py" line="3285"/> <source>Unittest</source> <translation>单元测试</translation> </message> @@ -78790,7 +78810,7 @@ <translation><b>键盘快捷键</b><p>将程序的键盘快捷键设置成你喜欢的按键。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6313"/> + <location filename="../UI/UserInterface.py" line="6320"/> <source>Export Keyboard Shortcuts</source> <translation>导出键盘快捷键</translation> </message> @@ -78810,7 +78830,7 @@ <translation><b>导出键盘快捷键</b><p>导出程序的键盘快捷键。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6337"/> + <location filename="../UI/UserInterface.py" line="6344"/> <source>Import Keyboard Shortcuts</source> <translation>导入键盘快捷键</translation> </message> @@ -79010,7 +79030,7 @@ <translation>窗口(&W)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3189"/> + <location filename="../UI/UserInterface.py" line="3196"/> <source>&Toolbars</source> <translation>工具栏(&T)</translation> </message> @@ -79025,117 +79045,117 @@ <translation>配置…</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3202"/> + <location filename="../UI/UserInterface.py" line="3209"/> <source>&Help</source> <translation>帮助(&H)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3277"/> + <location filename="../UI/UserInterface.py" line="3284"/> <source>Tools</source> <translation>工具</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3279"/> + <location filename="../UI/UserInterface.py" line="3286"/> <source>Settings</source> <translation>设置</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5111"/> + <location filename="../UI/UserInterface.py" line="5118"/> <source>Help</source> <translation>帮助</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3281"/> + <location filename="../UI/UserInterface.py" line="3288"/> <source>Profiles</source> <translation>模式</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3282"/> + <location filename="../UI/UserInterface.py" line="3289"/> <source>Plugins</source> <translation>插件</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3447"/> - <source><p>This part of the status bar displays the current editors language.</p></source> - <translation><p>状态栏的这一部分显示当前编辑器语言。</p></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="3454"/> - <source><p>This part of the status bar displays the current editors encoding.</p></source> - <translation><p>状态栏的这一部分显示当前编辑器编码。</p></translation> + <source><p>This part of the status bar displays the current editors language.</p></source> + <translation><p>状态栏的这一部分显示当前编辑器语言。</p></translation> </message> <message> <location filename="../UI/UserInterface.py" line="3461"/> - <source><p>This part of the status bar displays the current editors eol setting.</p></source> - <translation><p>状态栏的这一部分显示当前编辑器行尾设置。</p></translation> + <source><p>This part of the status bar displays the current editors encoding.</p></source> + <translation><p>状态栏的这一部分显示当前编辑器编码。</p></translation> </message> <message> <location filename="../UI/UserInterface.py" line="3468"/> - <source><p>This part of the status bar displays an indication of the current editors files writability.</p></source> - <translation><p>状态栏的这一部分显示当前编辑器文件是否可写。</p></translation> + <source><p>This part of the status bar displays the current editors eol setting.</p></source> + <translation><p>状态栏的这一部分显示当前编辑器行尾设置。</p></translation> </message> <message> <location filename="../UI/UserInterface.py" line="3475"/> - <source><p>This part of the status bar displays the line number of the current editor.</p></source> - <translation><p>状态栏的这一部分显示当前编辑的行号。</p></translation> + <source><p>This part of the status bar displays an indication of the current editors files writability.</p></source> + <translation><p>状态栏的这一部分显示当前编辑器文件是否可写。</p></translation> </message> <message> <location filename="../UI/UserInterface.py" line="3482"/> + <source><p>This part of the status bar displays the line number of the current editor.</p></source> + <translation><p>状态栏的这一部分显示当前编辑的行号。</p></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="3489"/> <source><p>This part of the status bar displays the cursor position of the current editor.</p></source> <translation><p>状态栏的这一部分显示当前编辑器的光标位置。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3664"/> + <location filename="../UI/UserInterface.py" line="3671"/> <source><h3>Version Numbers</h3><table></source> <translation><h3>版本号</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7302"/> + <location filename="../UI/UserInterface.py" line="7309"/> <source></table></source> <translation></table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3724"/> + <location filename="../UI/UserInterface.py" line="3731"/> <source>Email address or mail server address is empty. Please configure your Email settings in the Preferences Dialog.</source> <translation>电子邮件地址或邮件服务器地址为空。请在首选项对话框中配置你的电子邮件设置。</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4009"/> + <location filename="../UI/UserInterface.py" line="4016"/> <source>Restart application</source> <translation>重启程序</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4009"/> + <location filename="../UI/UserInterface.py" line="4016"/> <source>The application needs to be restarted. Do it now?</source> <translation>程序需要重启。现在重启？</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4090"/> + <location filename="../UI/UserInterface.py" line="4097"/> <source>Configure Tool Groups ...</source> <translation>配置工具组…</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4094"/> + <location filename="../UI/UserInterface.py" line="4101"/> <source>Configure current Tool Group ...</source> <translation>配置当前工具组…</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4045"/> + <location filename="../UI/UserInterface.py" line="4052"/> <source>&Builtin Tools</source> <translation>内建工具(&B)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4062"/> + <location filename="../UI/UserInterface.py" line="4069"/> <source>&Plugin Tools</source> <translation>插件工具(&P)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4210"/> + <location filename="../UI/UserInterface.py" line="4217"/> <source>&Show all</source> <translation>全部显示(&S)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4212"/> + <location filename="../UI/UserInterface.py" line="4219"/> <source>&Hide all</source> <translation>全部隐藏(&H)</translation> </message> @@ -79145,107 +79165,107 @@ <translation type="obsolete">当前项目未定义主脚本。终止</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5237"/> + <location filename="../UI/UserInterface.py" line="5244"/> <source>Problem</source> <translation>问题</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5426"/> + <location filename="../UI/UserInterface.py" line="5433"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6103"/> + <location filename="../UI/UserInterface.py" line="6110"/> <source>Open Browser</source> <translation>打开浏览器</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6103"/> + <location filename="../UI/UserInterface.py" line="6110"/> <source>Could not start a web browser</source> <translation>无法启动网络浏览器</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5111"/> + <location filename="../UI/UserInterface.py" line="5118"/> <source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source> <translation>目前没有选择自定义浏览器。请使用首选项对话框指定一个。</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5145"/> + <location filename="../UI/UserInterface.py" line="5152"/> <source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source> <translation><p>无法开启帮助浏览器。<br>确保其有效如 <b>hh</b>。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5371"/> + <location filename="../UI/UserInterface.py" line="5378"/> <source>External Tools</source> <translation>外部工具</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5901"/> + <location filename="../UI/UserInterface.py" line="5908"/> <source>Documentation Missing</source> <translation>文档缺失</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5884"/> + <location filename="../UI/UserInterface.py" line="5891"/> <source>Documentation</source> <translation>文档</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5709"/> + <location filename="../UI/UserInterface.py" line="5716"/> <source><p>The PyQt4 documentation starting point has not been configured.</p></source> <translation><p>未配置 PyQt4 文档起点。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6506"/> + <location filename="../UI/UserInterface.py" line="6513"/> <source>Save tasks</source> <translation>保存任务</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6535"/> + <location filename="../UI/UserInterface.py" line="6542"/> <source>Read tasks</source> <translation>读取任务</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6631"/> + <location filename="../UI/UserInterface.py" line="6638"/> <source>Save session</source> <translation>保存会话</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6615"/> + <location filename="../UI/UserInterface.py" line="6622"/> <source>Read session</source> <translation>读取会话</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6902"/> <source>Drop Error</source> <translation>降落误差</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7264"/> + <location filename="../UI/UserInterface.py" line="7271"/> <source>Error during updates check</source> <translation>检查更新时出错</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7080"/> + <location filename="../UI/UserInterface.py" line="7087"/> <source>&Cancel</source> <translation>取消(&C)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7245"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>Update available</source> <translation>可用更新</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7264"/> + <location filename="../UI/UserInterface.py" line="7271"/> <source>Could not perform updates check.</source> <translation>无法完成更新检查。</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7288"/> + <location filename="../UI/UserInterface.py" line="7295"/> <source><h3>Available versions</h3><table></source> <translation><h3>可用版本</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7339"/> + <location filename="../UI/UserInterface.py" line="7346"/> <source>First time usage</source> <translation>第一次使用</translation> </message> @@ -79325,7 +79345,7 @@ <translation>图标编辑器(&I)…</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5058"/> + <location filename="../UI/UserInterface.py" line="5065"/> <source>Qt 3 support</source> <translation>Qt 3 支持</translation> </message> @@ -79360,111 +79380,111 @@ <translation>{0} - {1} - {2} - 被动模式</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3558"/> + <location filename="../UI/UserInterface.py" line="3565"/> <source>External Tools/{0}</source> <translation>外部工具/{0}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5237"/> + <location filename="../UI/UserInterface.py" line="5244"/> <source><p>The file <b>{0}</b> does not exist or is zero length.</p></source> <translation><p>文件 <b>{0}</b> 不存在或者长度为零。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4961"/> + <location filename="../UI/UserInterface.py" line="4968"/> <source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动 Qt 设计师。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5030"/> + <location filename="../UI/UserInterface.py" line="5037"/> <source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动 Qt 语言家。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5083"/> + <location filename="../UI/UserInterface.py" line="5090"/> <source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动 Qt 助手。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5125"/> + <location filename="../UI/UserInterface.py" line="5132"/> <source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动自定义的查看器。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5193"/> + <location filename="../UI/UserInterface.py" line="5200"/> <source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动 UI 预览器。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5248"/> + <location filename="../UI/UserInterface.py" line="5255"/> <source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动翻译预览器。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5269"/> + <location filename="../UI/UserInterface.py" line="5276"/> <source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动 SQL 浏览器。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5362"/> + <location filename="../UI/UserInterface.py" line="5369"/> <source>No tool entry found for external tool '{0}' in tool group '{1}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5371"/> + <location filename="../UI/UserInterface.py" line="5378"/> <source>No toolgroup entry '{0}' found.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5410"/> + <location filename="../UI/UserInterface.py" line="5417"/> <source>Starting process '{0} {1}'. </source> <translation>正在启动进程“{0} {1}”。 </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5426"/> + <location filename="../UI/UserInterface.py" line="5433"/> <source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5502"/> + <location filename="../UI/UserInterface.py" line="5509"/> <source>Process '{0}' has exited. </source> <translation>进程“{0}”已退出。 </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5901"/> + <location filename="../UI/UserInterface.py" line="5908"/> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6506"/> + <location filename="../UI/UserInterface.py" line="6513"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation><p>任务文件 <b>{0}</b> 无法写入。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6535"/> + <location filename="../UI/UserInterface.py" line="6542"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation><p>任务文件 <b>{0}</b> 无法读取。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6569"/> + <location filename="../UI/UserInterface.py" line="6576"/> <source><p>The session file <b>{0}</b> could not be written.</p></source> <translation><p>会话文件 <b>{0}</b> 无法写入。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6615"/> + <location filename="../UI/UserInterface.py" line="6622"/> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation><p>会话文件 <b>{0}</b> 无法读取。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6895"/> + <location filename="../UI/UserInterface.py" line="6902"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> 不是一个文件。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7089"/> + <location filename="../UI/UserInterface.py" line="7096"/> <source>Trying host {0}</source> <translation>正在尝试主机 {0}</translation> </message> @@ -79499,7 +79519,7 @@ <translation>Alt+Shift+B</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6337"/> + <location filename="../UI/UserInterface.py" line="6344"/> <source>Keyboard shortcut file (*.e4k)</source> <translation>键盘快捷键文件 (*.e4k)</translation> </message> @@ -79539,17 +79559,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7153"/> + <location filename="../UI/UserInterface.py" line="7160"/> <source>Error getting versions information</source> <translation>获取版本信息出错</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7146"/> - <source>The versions information could not be downloaded. Please go online and try again.</source> - <translation>无法获取版本信息。请连线并再试一次。</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="7153"/> + <source>The versions information could not be downloaded. Please go online and try again.</source> + <translation>无法获取版本信息。请连线并再试一次。</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="7160"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation>过去7天均无法获取版本信息。请连线并再试一次。</translation> </message> @@ -79635,12 +79655,12 @@ <translation><b>快照</b><p>打开一个对话框来截取屏幕一个区域的快照。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5339"/> + <location filename="../UI/UserInterface.py" line="5346"/> <source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>无法启动快照工具。<br>请确保它作为 <b>{0}</b> 可用。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7358"/> + <location filename="../UI/UserInterface.py" line="7365"/> <source>Select Workspace Directory</source> <translation>选择工作区目录</translation> </message> @@ -80015,7 +80035,7 @@ <translation>打开 PyQt5 文档</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5771"/> + <location filename="../UI/UserInterface.py" line="5778"/> <source><p>The PyQt5 documentation starting point has not been configured.</p></source> <translation><p>未配置 PyQt5 文档起始位置。</p></translation> </message> @@ -80030,7 +80050,7 @@ <translation><b>Python 3 文档</b><p>显示 Python 3 文档。如果尚未配置文档目录，则在 Windows 系统上，文档位置将默认为 Python 3 可执行文件所在目录下的 doc 目录；在类 Unix 系统上，则默认为 <i>/usr/share/doc/packages/python/html</i>。请在环境中设置 PYTHON3DOCDIR 以覆盖默认行为。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7080"/> + <location filename="../UI/UserInterface.py" line="7087"/> <source>%v/%m</source> <translation type="unfinished"></translation> </message> @@ -80050,7 +80070,7 @@ <translation><b>显示错误日志…</b><p>打开一个对话框显示最近的错误日志。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7084"/> + <location filename="../UI/UserInterface.py" line="7091"/> <source>Version Check</source> <translation>版本检查</translation> </message> @@ -80120,27 +80140,27 @@ <translation><b>Eric API 文档</b><p>显示 Eric API 文档。文档位置为 Eric6 安装文件夹下的文档或源代码子文件夹。</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5058"/> + <location filename="../UI/UserInterface.py" line="5065"/> <source>Qt v.3 is not supported by eric6.</source> <translation>Qt 版本3 不被 eric6 支持。</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7245"/> + <location filename="../UI/UserInterface.py" line="7252"/> <source>The update to <b>{0}</b> of eric6 is available at <b>{1}</b>. Would you like to get it?</source> <translation>eric6 的 <b>{0}</b> 更新已经可用，位于 <b>{1}</b>。您是否希望下载它？</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7257"/> + <location filename="../UI/UserInterface.py" line="7264"/> <source>Eric6 is up to date</source> <translation>Eric6 已是最新版本</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7257"/> + <location filename="../UI/UserInterface.py" line="7264"/> <source>You are using the latest version of eric6</source> <translation>您正在使用 eric6 的最新版本</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7339"/> + <location filename="../UI/UserInterface.py" line="7346"/> <source>eric6 has not been configured yet. The configuration dialog will be started.</source> <translation>尚未配置 eric6。将打开配置对话框。</translation> </message> @@ -80150,17 +80170,17 @@ <translation>生成插件工具栏…</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4065"/> + <location filename="../UI/UserInterface.py" line="4072"/> <source>&User Tools</source> <translation>用户工具(&U)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4137"/> + <location filename="../UI/UserInterface.py" line="4144"/> <source>No User Tools Configured</source> <translation>没有配置的用户工具</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7100"/> + <location filename="../UI/UserInterface.py" line="7107"/> <source>The versions information cannot not be downloaded because you are <b>offline</b>. Please go online and try again.</source> <translation>因为当前处在 <b>离线</b> 状态，无法获取版本信息。请连线并再试一次。</translation> </message> @@ -80205,7 +80225,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6653"/> + <location filename="../UI/UserInterface.py" line="6660"/> <source>Load session</source> <translation type="unfinished">载入会话</translation> </message> @@ -80220,17 +80240,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6653"/> + <location filename="../UI/UserInterface.py" line="6660"/> <source>eric6 Session Files (*.e5s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6700"/> + <location filename="../UI/UserInterface.py" line="6707"/> <source>Crash Session found!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6700"/> + <location filename="../UI/UserInterface.py" line="6707"/> <source>A session file of a crashed session was found. Shall this session be restored?</source> <translation type="unfinished"></translation> </message> @@ -80245,17 +80265,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7233"/> + <location filename="../UI/UserInterface.py" line="7240"/> <source>Update Check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7233"/> + <location filename="../UI/UserInterface.py" line="7240"/> <source>You installed eric directly from the source code. There is no possibility to check for the availability of an update.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="7223"/> + <location filename="../UI/UserInterface.py" line="7230"/> <source>You are using a snapshot release of eric6. A more up-to-date stable release might be available.</source> <translation type="unfinished"></translation> </message> @@ -80310,7 +80330,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5884"/> + <location filename="../UI/UserInterface.py" line="5891"/> <source><p>The PySide{0} documentation starting point has not been configured.</p></source> <translation type="unfinished"></translation> </message> @@ -80340,22 +80360,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3128"/> + <location filename="../UI/UserInterface.py" line="3135"/> <source>Left Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3144"/> + <location filename="../UI/UserInterface.py" line="3151"/> <source>Bottom Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3155"/> + <location filename="../UI/UserInterface.py" line="3162"/> <source>Right Side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3179"/> + <location filename="../UI/UserInterface.py" line="3186"/> <source>Plug-ins</source> <translation type="unfinished"></translation> </message> @@ -80381,17 +80401,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6058"/> + <location filename="../UI/UserInterface.py" line="6065"/> <source>Start Web Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6000"/> + <location filename="../UI/UserInterface.py" line="6007"/> <source>The eric6 web browser could not be started.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6058"/> + <location filename="../UI/UserInterface.py" line="6065"/> <source><p>The eric6 web browser is not started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -80406,7 +80426,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3493"/> + <location filename="../UI/UserInterface.py" line="3500"/> <source><p>This part of the status bar allows zooming the current editor or shell.</p></source> <translation type="unfinished"></translation> </message> @@ -80480,6 +80500,11 @@ <source><b>MicroPython</b><p>This switches the input focus to the MicroPython window.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../UI/UserInterface.py" line="3128"/> + <source>Central Park</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>UserPropertiesDialog</name> @@ -90424,46 +90449,46 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1427"/> <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="2056"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2067"/> <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="2066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <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="1436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1447"/> <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="2048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2059"/> <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="2051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2071"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2082"/> <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="2075"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2086"/> <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> @@ -90471,12 +90496,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2061"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2072"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1481"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -90487,13 +90512,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2049"/> <source><tr><td><b>Head #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> </source> <translation type="unfinished"></translation>
