Fri, 04 Apr 2014 18:21:47 +0200
Added a Mercurial entry to cancel an uncommitted merge.
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Fri Apr 04 18:07:19 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Fri Apr 04 18:21:47 2014 +0200 @@ -413,6 +413,21 @@ self.vcsMergeAct.triggered.connect(self._vcsMerge) self.actions.append(self.vcsMergeAct) + self.hgCancelMergeAct = E5Action( + self.tr('Cancel uncommitted merge'), + self.tr('Cancel uncommitted merge'), + 0, 0, self, 'mercurial_cancel_merge') + self.hgCancelMergeAct.setStatusTip(self.tr( + 'Cancel an uncommitted merge and lose all changes' + )) + self.hgCancelMergeAct.setWhatsThis(self.tr( + """<b>Cancel uncommitted merge</b>""" + """<p>This cancels an uncommitted merge causing all changes""" + """ to be lost.</p>""" + )) + self.hgCancelMergeAct.triggered.connect(self.__hgCancelMerge) + self.actions.append(self.hgCancelMergeAct) + self.vcsResolveAct = E5Action( self.tr('Conflicts resolved'), self.tr('Con&flicts resolved'), @@ -848,8 +863,6 @@ self.hgRollbackAct.triggered.connect(self.__hgRollback) self.actions.append(self.hgRollbackAct) - # TODO: add support for hg update --clean to revert a failed/aborted merge - self.hgServeAct = E5Action( self.tr('Serve project repository'), self.tr('Serve project repository...'), @@ -1025,7 +1038,6 @@ adminMenu.addSeparator() adminMenu.addAction(self.hgRecoverAct) adminMenu.addSeparator() - # TODO: add support for hg update --clean to revert a failed/aborted merge adminMenu.addAction(self.hgBackoutAct) adminMenu.addAction(self.hgRollbackAct) adminMenu.addSeparator() @@ -1142,6 +1154,7 @@ menu.addAction(self.vcsRevertAct) menu.addAction(self.vcsMergeAct) menu.addAction(self.vcsResolveAct) + menu.addAction(self.hgCancelMergeAct) menu.addSeparator() menu.addAction(self.vcsSwitchAct) menu.addSeparator() @@ -1273,6 +1286,12 @@ """ self.vcs.hgResolve(self.project.ppath) + def __hgCancelMerge(self): + """ + Private slot used to cancel an uncommitted merge. + """ + self.vcs.hgCancelMerge(self.project.ppath) + def __hgTagList(self): """ Private slot used to list the tags of the project. @@ -1429,8 +1448,6 @@ """ self.vcs.hgRollback(self.project.ppath) - # TODO: add support for hg update --clean to revert a failed/aborted merge - def __hgServe(self): """ Private slot used to serve the project.
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Fri Apr 04 18:07:19 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Fri Apr 04 18:21:47 2014 +0200 @@ -2105,6 +2105,36 @@ dia.exec_() self.checkVCSStatus() + def hgCancelMerge(self, name): + """ + Public method to cancel an uncommitted merge. + + @param name file/directory name (string) + @return flag indicating, that the cancellation contained an add + or delete (boolean) + """ + dname, fname = self.splitPath(name) + + # find the root of the repo + repodir = dname + while not os.path.isdir(os.path.join(repodir, self.adminDir)): + repodir = os.path.dirname(repodir) + if os.path.splitdrive(repodir)[1] == os.sep: + return + + args = self.initCommand("update") + args.append("--clean") + + dia = HgDialog( + self.tr('Cancelling uncommitted merge'), + self) + res = dia.startProcess(args, repodir, False) + if res: + dia.exec_() + res = dia.hasAddOrDelete() + self.checkVCSStatus() + return res + def hgBranch(self, name): """ Public method used to create a branch in the Mercurial repository. @@ -2768,8 +2798,6 @@ if res: dia.exec_() - # TODO: add support for hg update --clean to revert a failed/aborted merge - def hgServe(self, name): """ Public method used to serve the project.
--- a/i18n/eric5_cs.ts Fri Apr 04 18:07:19 2014 +0200 +++ b/i18n/eric5_cs.ts Fri Apr 04 18:21:47 2014 +0200 @@ -20030,87 +20030,87 @@ <translation type="obsolete">Zadejte název větve</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> <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="2305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2335"/> <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="2330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> <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="2378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2408"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> - <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="2181"/> - <source>Showing current branch</source> - <translation>Zobrazení aktuální větve</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2535"/> - <source>Create changegroup</source> - <translation>Vytvořit skupinu změn</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2615"/> - <source>Apply changegroups</source> - <translation>Použít skupinu změn</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/> + <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="2211"/> + <source>Showing current branch</source> + <translation>Zobrazení aktuální větve</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2565"/> + <source>Create changegroup</source> + <translation>Vytvořit skupinu změn</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> + <source>Apply changegroups</source> + <translation>Použít skupinu změn</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2669"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2586"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2432"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/> <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="2701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2731"/> <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="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2522"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -20120,7 +20120,7 @@ <translation type="obsolete"><p>Soubor Mercurial skupiny změn<b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2625"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation> </message> @@ -20130,27 +20130,27 @@ <translation type="obsolete">Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2791"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> <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="2509"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2539"/> <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="2788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2818"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -20160,72 +20160,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3445"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3307"/> <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="3445"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473"/> <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="2858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2933"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2980"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3005"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3033"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3031"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3176"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3209"/> <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="3129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3157"/> <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="3200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3228"/> <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="3200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3228"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3197"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -20255,7 +20255,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3094"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -20280,7 +20280,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2189"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> @@ -20289,6 +20289,11 @@ <source>Current branch tip</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> + <source>Cancelling uncommitted merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -23699,157 +23704,157 @@ <translation type="obsolete"><b>Vyřešit konflikty</b><p>Vyřeší se všechny konflikty v lokálním projektu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>Tag in repository</source> <translation>Vytvořit tag v repozitáři</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>&Tag in repository...</source> - <translation>Vytvořit &tag v repozitáři...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> - <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="439"/> - <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="446"/> - <source>List tags</source> - <translation>Seznam tagů</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <source>&Tag in repository...</source> + <translation>Vytvořit &tag v repozitáři...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> + <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="454"/> + <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="461"/> + <source>List tags</source> + <translation>Seznam tagů</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> <source>List tags...</source> <translation>Seznam tagů...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465"/> <source>List tags of the project</source> <translation>Seznam tagů projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> <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="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> <source>List branches</source> <translation>Seznam větví</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> <source>List branches...</source> <translation>Seznam větví...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> - <source>List branches of the project</source> - <translation>Seznam větví projektu</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> - <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="474"/> - <source>Create branch</source> - <translation>Vytvořit větev</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> - <source>Create &branch...</source> - <translation>Narou&bovat větev...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> - <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> + <source>List branches of the project</source> + <translation>Seznam větví projektu</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> + <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="489"/> + <source>Create branch</source> + <translation>Vytvořit větev</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> + <source>Create &branch...</source> + <translation>Narou&bovat větev...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> + <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="497"/> <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="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>Close branch</source> <translation>Zavřít větev</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> <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="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> <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="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> <source>Switch</source> <translation>Přepnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> <source>S&witch...</source> <translation>&Přepnout...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> - <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="542"/> - <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="550"/> - <source>Cleanup</source> - <translation>Vyčistit</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Cleanu&p</source> - <translation>Vy&prat</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> - <source>Cleanup the local project</source> - <translation>Vyčistit lokální projekt</translation> + <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="557"/> + <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="565"/> + <source>Cleanup</source> + <translation>Vyčistit</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565"/> + <source>Cleanu&p</source> + <translation>Vy&prat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="569"/> + <source>Cleanup the local project</source> + <translation>Vyčistit lokální projekt</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> <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="564"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> <source>Execute command</source> <translation>Provést příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> <source>E&xecute command...</source> <translation>P&rovést příkaz...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583"/> <source>Execute an arbitrary Mercurial command</source> <translation>Spustit libovolný Mercurial příkaz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> <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> @@ -23874,22 +23879,22 @@ <translation type="obsolete"><b>Parametry příkazu...</b><p>Zobrazí se dialog s editací parametrů Mercurial příkazu.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> <source>Configure</source> <translation>Konfigurovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> <source>Configure...</source> <translation>Konfigurovat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> <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="586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> <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> @@ -23934,62 +23939,62 @@ <translation type="obsolete"><b>Zobrazit kombinovaná nastavení konfigurace</b><p>Toto zobrazí kombinovaná nastavení ze všech konfigurací.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source>Show paths</source> <translation>Zobrazit cesty</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source>Show paths...</source> <translation>Zobrazit cesty...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> <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="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> <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="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Verify repository</source> <translation>Ověřit repozitář</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Verify repository...</source> <translation>Ověřit repozitář...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> <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="660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> <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="667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Recover</source> <translation>Zotavit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Recover...</source> <translation>Zotavit...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> <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="674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> <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> @@ -23999,112 +24004,112 @@ <translation type="obsolete">Administrace repozitáře</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> <source>Create .hgignore</source> <translation>Vytvořit .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <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="702"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> <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="709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> <source>Create changegroup...</source> <translation>Vytvořit skupinu změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <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="1388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1407"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> - <source>Apply changegroups...</source> - <translation>Použít skupinu změn...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> - <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="1044"/> - <source>Changegroup Management</source> - <translation>Správa skupin změn</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/> - <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="746"/> - <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="520"/> - <source>Show current branch</source> - <translation>Zobrazit aktuální větev</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> - <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="527"/> - <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="754"/> - <source>Mark as "good"</source> - <translation>Označit jako "v pořádku"</translation> + <source>Apply changegroups...</source> + <translation>Použít skupinu změn...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758"/> - <source>Mark a selectable changeset as good</source> - <translation>Označit volitelnou množinu změn, že je v pořádku</translation> + <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="1056"/> + <source>Changegroup Management</source> + <translation>Správa skupin změn</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> + <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="761"/> + <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="535"/> + <source>Show current branch</source> + <translation>Zobrazit aktuální větev</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> + <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="542"/> + <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="769"/> + <source>Mark as "good"</source> + <translation>Označit jako "v pořádku"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <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="776"/> <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="768"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> <source>Mark as "bad"</source> <translation>Označit jako "špatná"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="772"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="787"/> <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="775"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <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="782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source>Skip</source> <translation>Přeskočit</translation> </message> @@ -24119,72 +24124,72 @@ <translation type="obsolete"><b>Přeskočit</b><p>Aktuální množina změn se přeskočí.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> <source>Reset</source> <translation>Reset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> <source>Reset the bisect search data</source> <translation>Reset vyhledávání bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> <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="1057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1069"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> <source>Mark as "good"...</source> <translation>Označit jako "v pořádku"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> <source>Mark as "bad"...</source> <translation>Označit jako "špatná"...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Preview changegroup...</source> <translation>Náhled skupiny změn...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> <source>Identify</source> <translation>Identifikovat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> <source>Identify...</source> <translation>Identifikovat...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Identify the project directory</source> <translation>Identifikovat adresář projektu</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <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="728"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <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="731"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> <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> @@ -24209,17 +24214,17 @@ <translation type="obsolete"><b>Identifikovat skupinu změn</b><p>Identifikuje soubor se skupinou změn obsahující množinu změn.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source>Back out changeset</source> <translation>Vycouvat z množiny změn</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="814"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <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="817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <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> @@ -24239,317 +24244,317 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="870"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> <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="1035"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1244"/> <source>Pull</source> <translation type="unfinished">Stáhnout</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1501"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1518"/> <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="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <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="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> <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="824"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <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="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> <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="608"/> - <source>Edit repository configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="612"/> - <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="615"/> - <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="623"/> - <source>Show combined configuration settings</source> + <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source>Show combined configuration settings...</source> + <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> + <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="630"/> + <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="638"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> <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="631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> <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="782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> <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="1446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1463"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="884"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> <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="1051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1483"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> <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="896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> <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="1486"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1503"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="918"/> - <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="927"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/> + <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="940"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <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="934"/> - <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="1077"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1501"/> - <source>Copy Changesets (Continue)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> - <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="423"/> - <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="942"/> - <source>Add</source> - <translation type="unfinished">Přidat</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> - <source>Add...</source> - <translation type="unfinished">Přidat...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="947"/> + <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="1089"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1518"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <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="438"/> + <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="955"/> + <source>Add</source> + <translation type="unfinished">Přidat</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <source>Add...</source> + <translation type="unfinished">Přidat...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> <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="957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> <source>Remove</source> <translation type="unfinished">Odebrat</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="962"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/> <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="1086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -24579,32 +24584,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> <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="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <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="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> <source>Administration</source> <translation type="unfinished"></translation> </message> @@ -24628,6 +24633,21 @@ <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> + <source>Cancel uncommitted merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> + <source>Cancel an uncommitted merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> + <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> </context> <context> <name>HgPurgeListDialog</name>
--- a/i18n/eric5_de.ts Fri Apr 04 18:07:19 2014 +0200 +++ b/i18n/eric5_de.ts Fri Apr 04 18:21:47 2014 +0200 @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> +<!DOCTYPE TS> +<TS version="2.1" language="de"> <context> <name>AboutDialog</name> <message> @@ -1943,8 +1944,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksMenu.py" line="142"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open in New &Tab Ctrl+LMB</source> + <translation>In neuem &Register öffnen Strg+LMK</translation> </message> </context> <context> @@ -2180,8 +2181,8 @@ </message> <message> <location filename="../Helpviewer/Bookmarks/BookmarksToolBar.py" line="90"/> - <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open in New &Tab Ctrl+LMB</source> + <translation>In neuem &Register öffnen Strg+LMK</translation> </message> </context> <context> @@ -15954,8 +15955,8 @@ </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1083"/> - <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> - <translation>Link in neuem Fenster öffnen<byte value="x9"/>Strg+LMK</translation> + <source>Open Link in New Tab Ctrl+LMB</source> + <translation>Link in neuem Fenster öffnen Strg+LMK</translation> </message> <message> <location filename="../Helpviewer/HelpBrowserWV.py" line="1156"/> @@ -19139,117 +19140,117 @@ <translation>Löse Dateien/Verzeichnisse auf</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> <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="2305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2335"/> <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="2330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> <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="2378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2408"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> - <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="2181"/> - <source>Showing current branch</source> - <translation>Zeige aktuellen Zweig</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2535"/> - <source>Create changegroup</source> - <translation>Änderungsgruppe erzeugen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2615"/> - <source>Apply changegroups</source> - <translation>Änderungsgruppen anwenden</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/> + <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="2211"/> + <source>Showing current branch</source> + <translation>Zeige aktuellen Zweig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2565"/> + <source>Create changegroup</source> + <translation>Änderungsgruppe erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> + <source>Apply changegroups</source> + <translation>Änderungsgruppen anwenden</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2669"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial-Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2586"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2432"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/> <source>Create .hgignore file</source> <translation>.hgignore-Datei erstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/> <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="2701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2731"/> <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="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2522"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial-Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2625"/> <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="2761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2791"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2509"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2539"/> <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="2788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2818"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen Sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> @@ -19259,72 +19260,72 @@ <translation>Pflege Änderungen in das Mercurial-Repository ein</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3445"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473"/> <source>Mercurial Command Server</source> <translation>Mercurial-Befehlsserver</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3307"/> <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="3445"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473"/> <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="2858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2933"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2980"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3005"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3033"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3031"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3176"/> <source>Add Sub-repository</source> <translation>Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3209"/> <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="3129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3157"/> <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="3200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3228"/> <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="3200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3228"/> <source>Remove Sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3197"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Die Unterrepositorydatei .hgsub existiert nicht. Abbruch...</p></translation> </message> @@ -19354,7 +19355,7 @@ <translation>Wollen Sie wirklich alle Änderungen des Projektes rückgängig machen?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3094"/> <source>Create Unversioned Archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> @@ -19379,7 +19380,7 @@ <translation>Marke im Mercurial-Repository setzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2189"/> <source>Created new branch <{0}>.</source> <translation>Neuer Zweig <{0}> wurde angelegt.</translation> </message> @@ -19388,6 +19389,11 @@ <source>Current branch tip</source> <translation>Spitze des aktuellen Zweigs</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> + <source>Cancelling uncommitted merge</source> + <translation>Breche Zusammenführung ab</translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -22619,432 +22625,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="431"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>Tag in repository</source> <translation>Im Repository markieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>&Tag in repository...</source> - <translation>Im Repository &markieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> - <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="439"/> - <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="446"/> - <source>List tags</source> - <translation>Marken listen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <source>&Tag in repository...</source> + <translation>Im Repository &markieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> + <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="454"/> + <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="461"/> + <source>List tags</source> + <translation>Marken listen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> <source>List tags...</source> <translation>Marken listen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465"/> <source>List tags of the project</source> <translation>Listet Marken des Projektes</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> <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="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> <source>List branches</source> <translation>Zweige listen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> <source>List branches...</source> <translation>Zweige listen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> - <source>List branches of the project</source> - <translation>Listet Zweige des Projektes</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> - <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="474"/> - <source>Create branch</source> - <translation>Zweig erzeugen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> - <source>Create &branch...</source> - <translation>&Zweig erzeugen...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> - <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> + <source>List branches of the project</source> + <translation>Listet Zweige des Projektes</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> + <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="489"/> + <source>Create branch</source> + <translation>Zweig erzeugen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> + <source>Create &branch...</source> + <translation>&Zweig erzeugen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> + <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="497"/> <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="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>Close branch</source> <translation>Zweig abschließen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> <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="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> <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="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> <source>Switch</source> <translation>Umschalten</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> <source>S&witch...</source> <translation>Umschal&ten...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> - <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="542"/> - <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="550"/> - <source>Cleanup</source> - <translation>Aufräumen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Cleanu&p</source> - <translation>Au&fräumen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> - <source>Cleanup the local project</source> - <translation>Räume das lokale Projekt auf</translation> + <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="557"/> + <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="565"/> + <source>Cleanup</source> + <translation>Aufräumen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565"/> + <source>Cleanu&p</source> + <translation>Au&fräumen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="569"/> + <source>Cleanup the local project</source> + <translation>Räume das lokale Projekt auf</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> <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="564"/> - <source>Execute command</source> - <translation>Befehl ausführen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> - <source>E&xecute command...</source> - <translation>Befehl ausf&ühren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> - <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="571"/> - <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="579"/> - <source>Configure</source> - <translation>Einstellungen</translation> + <source>Execute command</source> + <translation>Befehl ausführen</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> - <source>Configure...</source> - <translation>Einstellungen...</translation> + <source>E&xecute command...</source> + <translation>Befehl ausf&ühren...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583"/> - <source>Show the configuration dialog with the Mercurial page selected</source> - <translation>Zeigt den Konfigurationsdialog mit ausgewählter Mercurial-Seite</translation> + <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="586"/> + <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="594"/> + <source>Configure</source> + <translation>Einstellungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <source>Configure...</source> + <translation>Einstellungen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <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="601"/> <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="639"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source>Show paths</source> <translation>Pfade anzeigen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source>Show paths...</source> <translation>Pfade anzeigen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> <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="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> <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="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Verify repository</source> <translation>Repository verifizieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Verify repository...</source> <translation>Repository verifizieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> <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="660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> <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="667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Recover</source> <translation>Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Recover...</source> <translation>Transaktion zurücksetzen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> <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="674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> <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="695"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> <source>Create .hgignore</source> <translation>Erstelle .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <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="702"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> <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="709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> <source>Create changegroup...</source> <translation>Änderungsgruppe erzeugen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <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="1388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1407"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <source>Apply changegroups...</source> + <translation>Änderungsgruppen anwenden...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758"/> + <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="1056"/> + <source>Changegroup Management</source> + <translation>Verwaltung von Änderungsgruppen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> + <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="761"/> + <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="535"/> + <source>Show current branch</source> + <translation>Zeige aktuellen Zweig</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> + <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="542"/> + <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="769"/> + <source>Mark as "good"</source> + <translation>Als „gut“ markieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <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="776"/> + <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="783"/> + <source>Mark as "bad"</source> + <translation>Als „schlecht“ markieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="787"/> + <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="790"/> + <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="797"/> + <source>Skip</source> + <translation>Überspringen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> + <source>Reset</source> + <translation>Zurücksetzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <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="818"/> + <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="1069"/> + <source>Bisect</source> + <translation>Bisect</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> + <source>Mark as "good"...</source> + <translation>Als „gut“ markieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <source>Mark as "bad"...</source> + <translation>Als „schlecht“ markieren...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> - <source>Apply changegroups...</source> - <translation>Änderungsgruppen anwenden...</translation> + <source>Preview changegroup</source> + <translation>Änderungsgruppe ansehen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <source>Preview changegroup...</source> + <translation>Änderungsgruppe ansehen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <source>Identify</source> + <translation>Identifizieren</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <source>Identify...</source> + <translation>Identifizieren...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> + <source>Identify the project directory</source> + <translation>Identifiziere das Projektverzeichnis</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> + <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="743"/> - <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="1044"/> - <source>Changegroup Management</source> - <translation>Verwaltung von Änderungsgruppen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/> - <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> + <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="746"/> - <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="520"/> - <source>Show current branch</source> - <translation>Zeige aktuellen Zweig</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> - <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="527"/> - <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="754"/> - <source>Mark as "good"</source> - <translation>Als „gut“ markieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758"/> - <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="761"/> - <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="768"/> - <source>Mark as "bad"</source> - <translation>Als „schlecht“ markieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="772"/> - <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="775"/> - <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="782"/> - <source>Skip</source> - <translation>Überspringen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> - <source>Reset</source> - <translation>Zurücksetzen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> - <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="803"/> - <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="1057"/> - <source>Bisect</source> - <translation>Bisect</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> - <source>Mark as "good"...</source> - <translation>Als „gut“ markieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> - <source>Mark as "bad"...</source> - <translation>Als „schlecht“ markieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> - <source>Preview changegroup</source> - <translation>Änderungsgruppe ansehen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> - <source>Preview changegroup...</source> - <translation>Änderungsgruppe ansehen...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> - <source>Identify</source> - <translation>Identifizieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> - <source>Identify...</source> - <translation>Identifizieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> - <source>Identify the project directory</source> - <translation>Identifiziere das Projektverzeichnis</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> - <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="728"/> - <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="731"/> <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="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source>Back out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="814"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <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="817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <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> @@ -23064,317 +23070,317 @@ <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="1035"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047"/> <source>Specials</source> <translation>Spezialfunktionen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> <source>Serve project repository</source> <translation>Server für Projektrepository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> <source>Serve project repository...</source> <translation>Server für Projektrepository...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="870"/> <source>Serve the project repository</source> <translation>Server für das Projektrepository bereitstellen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> <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="1231"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1244"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1501"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1518"/> <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="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> <source>Push new branch</source> <translation>Neuen Zweig hochladen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <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="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> <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="824"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/> <source>Rollback the last transaction</source> <translation>Die letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source>Extensions</source> <translation>Erweiterungen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> <source>Edit user configuration</source> <translation>Nutzerkonfiguration editieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> <source>Edit user configuration...</source> <translation>Nutzerkonfiguration editieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <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="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> <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="608"/> - <source>Edit repository configuration</source> - <translation>Repositorykonfiguration editieren</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> - <source>Edit repository configuration...</source> - <translation>Repositorykonfiguration editieren...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="612"/> - <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="615"/> - <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="623"/> - <source>Show combined configuration settings</source> - <translation>Zeige kombinierte Einstellungen</translation> + <source>Edit repository configuration</source> + <translation>Repositorykonfiguration editieren</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source>Show combined configuration settings...</source> - <translation>Zeige kombinierte Einstellungen...</translation> + <source>Edit repository configuration...</source> + <translation>Repositorykonfiguration editieren...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> + <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="630"/> + <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="638"/> + <source>Show combined configuration settings</source> + <translation>Zeige kombinierte Einstellungen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <source>Show combined configuration settings...</source> + <translation>Zeige kombinierte Einstellungen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> <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="631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> <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="782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source>Skip...</source> <translation>Überspringen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Skip a selectable changeset</source> <translation>Überspringe einen auswählbaren Änderungssatz</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> <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="1446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1463"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> <source>Import Patch...</source> <translation>Patch importieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="884"/> <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="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> <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="1051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Patch Management</source> <translation>Verwaltung von Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1483"/> <source>Revert Changes</source> <translation>Änderungen rückgängig machen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> <source>Export Patches...</source> <translation>Patches exportieren...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> <source>Export revisions to patch files</source> <translation>Änderungssätze in Patchdateien exportieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> <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="896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> <source>Change Phase...</source> <translation>Phase ändern...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> <source>Change the phase of revisions</source> <translation>Ändert die Phase von Revisionen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> <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="1486"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1503"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> <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="918"/> - <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="927"/> - <source>Continue Copying Session</source> - <translation>Kopiersitzung fortsetzen</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/> + <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="940"/> + <source>Continue Copying Session</source> + <translation>Kopiersitzung fortsetzen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <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="934"/> - <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="1077"/> - <source>Graft</source> - <translation>Graft</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1501"/> - <source>Copy Changesets (Continue)</source> - <translation>Änderungssätze kopieren (Fortsetzung)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>Conflicts resolved</source> - <translation>Konflikte gelöst</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>Con&flicts resolved</source> - <translation>&Konflikte gelöst</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> - <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="423"/> - <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="942"/> - <source>Add</source> - <translation>Hinzufügen</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> - <source>Add...</source> - <translation>Hinzufügen...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="947"/> + <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="1089"/> + <source>Graft</source> + <translation>Graft</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1518"/> + <source>Copy Changesets (Continue)</source> + <translation>Änderungssätze kopieren (Fortsetzung)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <source>Conflicts resolved</source> + <translation>Konflikte gelöst</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <source>Con&flicts resolved</source> + <translation>&Konflikte gelöst</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <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="438"/> + <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="955"/> + <source>Add</source> + <translation>Hinzufügen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <source>Add...</source> + <translation>Hinzufügen...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Add a sub-repository</source> <translation>Ein Unterrepository hinzufügen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> <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="957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> <source>Remove</source> <translation>Entfernen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> <source>Remove...</source> <translation>Entfernen...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="962"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Remove sub-repositories</source> <translation>Unterrepositorys löschen</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/> <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="1086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Sub-Repository</source> <translation>Unterrepository</translation> </message> @@ -23404,32 +23410,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="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> <source>Create unversioned archive</source> <translation>Erzeuge nicht versioniertes Archiv</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> <source>Create unversioned archive...</source> <translation>Erzeuge nicht versioniertes Archiv...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> <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="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> <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="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <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="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> <source>Administration</source> <translation>Verwaltung</translation> </message> @@ -23453,6 +23459,21 @@ <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <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="416"/> + <source>Cancel uncommitted merge</source> + <translation>Zusammenführung abbrechen</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> + <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="423"/> + <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> </context> <context> <name>HgPurgeListDialog</name>
--- a/i18n/eric5_en.ts Fri Apr 04 18:07:19 2014 +0200 +++ b/i18n/eric5_en.ts Fri Apr 04 18:21:47 2014 +0200 @@ -19035,117 +19035,117 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2211"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2335"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2408"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2432"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/> <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="2535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2565"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2522"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2509"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2539"/> <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="2556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2586"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2625"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2615"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> - <source>Shall the working directory be updated?</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/> + <source>Shall the working directory be updated?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2669"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2731"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2791"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2818"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -19155,72 +19155,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3445"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3307"/> <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="3445"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473"/> <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="2858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2933"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2980"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3005"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3033"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3031"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3176"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3209"/> <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="3129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3157"/> <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="3200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3228"/> <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="3200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3228"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3197"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -19250,7 +19250,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3094"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -19275,7 +19275,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2189"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> @@ -19284,6 +19284,11 @@ <source>Current branch tip</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> + <source>Cancelling uncommitted merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -22489,747 +22494,747 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>Tag in repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>&Tag in repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> - <source>Tag the local project in the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> - <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="446"/> - <source>List tags</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <source>&Tag in repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> + <source>Tag the local project in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> + <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="461"/> + <source>List tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> <source>List tags...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465"/> <source>List tags 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="468"/> <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="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> <source>List branches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> <source>List branches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> - <source>List branches of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> - <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="474"/> - <source>Create branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> - <source>Create &branch...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> - <source>Create a new branch for the local project in the repository</source> + <source>List branches of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> + <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="489"/> + <source>Create branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> + <source>Create &branch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> + <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="497"/> <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="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>Close branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> <source>Close the current branch of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> <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="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> <source>Show current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> - <source>Show the current branch of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <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="534"/> - <source>Switch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> - <source>S&witch...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> - <source>Switch the working directory to another revision</source> + <source>Show the current branch of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> - <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="550"/> - <source>Cleanup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Cleanu&p</source> + <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="549"/> + <source>Switch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> + <source>S&witch...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> - <source>Cleanup the local project</source> + <source>Switch the working directory to another revision</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> + <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="565"/> + <source>Cleanup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565"/> + <source>Cleanu&p</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="569"/> + <source>Cleanup the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> <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="564"/> - <source>Execute command</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> - <source>E&xecute command...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> - <source>Execute an arbitrary Mercurial command</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> - <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="579"/> - <source>Configure</source> + <source>Execute command</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> - <source>Configure...</source> + <source>E&xecute command...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583"/> - <source>Show the configuration dialog with the Mercurial page selected</source> + <source>Execute an arbitrary Mercurial command</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> + <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="594"/> + <source>Configure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <source>Configure...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <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="601"/> <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="639"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> <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="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> <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="667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Recover</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> <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="681"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> <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="695"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> <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="709"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> - <source>Create changegroup...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> - <source>Create changegroup file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/> - <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="724"/> - <source>Preview changegroup</source> + <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> - <source>Preview changegroup...</source> + <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> - <source>Preview a changegroup file containing a collection of changesets</source> + <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> - <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="1388"/> - <source>Apply changegroups</source> + <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="739"/> + <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> - <source>Apply changegroups...</source> + <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> - <source>Apply one or several changegroup files</source> + <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="746"/> - <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> + <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="1407"/> + <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> - <source>Mark as "good"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> - <source>Mark as "good"...</source> + <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758"/> - <source>Mark a selectable changeset as good</source> + <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> + <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="769"/> + <source>Mark as "good"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <source>Mark a selectable changeset as good</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> <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="768"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="772"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="787"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> <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="782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> <source>Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> <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="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="814"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <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="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="870"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> <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="1035"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1069"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1231"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1244"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1501"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1518"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <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="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> <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="824"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <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="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> <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="608"/> - <source>Edit repository configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="612"/> - <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="615"/> - <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="623"/> - <source>Show combined configuration settings</source> + <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source>Show combined configuration settings...</source> + <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> + <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="630"/> + <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="638"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> <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="631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> <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="782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> <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="1446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1463"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="884"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> <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="1051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1483"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> <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="896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> <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="1486"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1503"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="918"/> - <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="927"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/> + <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="940"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <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="934"/> - <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="1077"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1501"/> - <source>Copy Changesets (Continue)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> - <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="423"/> - <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="942"/> - <source>Add</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> - <source>Add...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="947"/> + <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="1089"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1518"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <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="438"/> + <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="955"/> + <source>Add</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <source>Add...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> <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="957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> <source>Remove</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="962"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/> <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="1086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -23259,32 +23264,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> <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="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <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="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> <source>Administration</source> <translation type="unfinished"></translation> </message> @@ -23308,6 +23313,21 @@ <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> + <source>Cancel uncommitted merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> + <source>Cancel an uncommitted merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> + <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> </context> <context> <name>HgPurgeListDialog</name>
--- a/i18n/eric5_es.ts Fri Apr 04 18:07:19 2014 +0200 +++ b/i18n/eric5_es.ts Fri Apr 04 18:21:47 2014 +0200 @@ -19139,92 +19139,92 @@ <translation>Comando de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> <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="2305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2335"/> <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="2330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360"/> <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="2354"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2408"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> - <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="2181"/> - <source>Showing current branch</source> - <translation>Mostrando la branch actual</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2535"/> - <source>Create changegroup</source> - <translation>Crear changegroup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2615"/> - <source>Apply changegroups</source> - <translation>Aplicar changegroups</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/> + <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="2211"/> + <source>Showing current branch</source> + <translation>Mostrando la branch actual</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2565"/> + <source>Create changegroup</source> + <translation>Crear changegroup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> + <source>Apply changegroups</source> + <translation>Aplicar changegroups</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2669"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2586"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2432"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/> <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="2701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2731"/> <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="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2522"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2625"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Archivos Changegroup de Mercurial (*.hg);;Todos los Archivos (*)</translation> </message> @@ -19234,27 +19234,27 @@ <translation type="obsolete">Identificando archivo de changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2791"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> <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="2509"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2539"/> <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="2788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2818"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> <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> @@ -19264,72 +19264,72 @@ <translation>Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3445"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473"/> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3307"/> <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="3445"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473"/> <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="2858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2933"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2980"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3005"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3033"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3031"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3176"/> <source>Add Sub-repository</source> <translation>Añadir Sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3209"/> <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="3129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3157"/> <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="3200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3228"/> <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="3200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3228"/> <source>Remove Sub-repositories</source> <translation>Eliminar Sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3197"/> <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> @@ -19359,7 +19359,7 @@ <translation>¿Realmente desea revertir todos los cambios del proyecto?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3094"/> <source>Create Unversioned Archive</source> <translation>Crear Archivo Sin Versionar</translation> </message> @@ -19384,7 +19384,7 @@ <translation>Haciendo tag en el repositorio Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2189"/> <source>Created new branch <{0}>.</source> <translation>Creada nueva branch <{0}>.</translation> </message> @@ -19393,6 +19393,11 @@ <source>Current branch tip</source> <translation>Tip branch actual</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> + <source>Cancelling uncommitted merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -22671,417 +22676,417 @@ <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="431"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>Tag in repository</source> <translation>Crear un Tag en el repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>&Tag in repository...</source> - <translation>Crear un &Tag en el repositorio...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> - <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="439"/> - <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="446"/> - <source>List tags</source> - <translation>Listar tags</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <source>&Tag in repository...</source> + <translation>Crear un &Tag en el repositorio...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> + <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="454"/> + <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="461"/> + <source>List tags</source> + <translation>Listar tags</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> <source>List tags...</source> <translation>Listar tags...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465"/> <source>List tags of the project</source> <translation>Lista los tags del proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> <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="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> <source>List branches</source> <translation>Listar branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> <source>List branches...</source> <translation>Listar branches...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> - <source>List branches of the project</source> - <translation>Lista las branches del proyecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> - <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="474"/> - <source>Create branch</source> - <translation>Crear branch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> - <source>Create &branch...</source> - <translation>Crear &branch...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> - <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> + <source>List branches of the project</source> + <translation>Lista las branches del proyecto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> + <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="489"/> + <source>Create branch</source> + <translation>Crear branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> + <source>Create &branch...</source> + <translation>Crear &branch...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> + <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="497"/> <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="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>Close branch</source> <translation>Cerrar branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> <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="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> <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="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> <source>Switch</source> <translation>Hacer switch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> <source>S&witch...</source> <translation>Hacer s&witch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> - <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="542"/> - <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="550"/> - <source>Cleanup</source> - <translation>Limpiar (cleanup)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Cleanu&p</source> - <translation>Lim&piar (cleanup)</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> - <source>Cleanup the local project</source> - <translation>Limpiar (cleanup) el proyecto local</translation> + <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="557"/> + <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="565"/> + <source>Cleanup</source> + <translation>Limpiar (cleanup)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565"/> + <source>Cleanu&p</source> + <translation>Lim&piar (cleanup)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="569"/> + <source>Cleanup the local project</source> + <translation>Limpiar (cleanup) el proyecto local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> <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="564"/> - <source>Execute command</source> - <translation>Ejecutar comando</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> - <source>E&xecute command...</source> - <translation>E&jecutar comando...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> - <source>Execute an arbitrary Mercurial command</source> - <translation>Ejecuta un comando Mercurial arbitrario</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> - <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="579"/> - <source>Configure</source> - <translation>Configurar</translation> + <source>Execute command</source> + <translation>Ejecutar comando</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> - <source>Configure...</source> - <translation>Configurar...</translation> + <source>E&xecute command...</source> + <translation>E&jecutar comando...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583"/> - <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> + <source>Execute an arbitrary Mercurial command</source> + <translation>Ejecuta un comando Mercurial arbitrario</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> + <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="594"/> + <source>Configure</source> + <translation>Configurar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <source>Configure...</source> + <translation>Configurar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <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="601"/> <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="639"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source>Show paths</source> <translation>Mostrar rutas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source>Show paths...</source> <translation>Mostrar rutas...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> <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="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> <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="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Verify repository</source> <translation>Verificar repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Verify repository...</source> <translation>Verificar repositorio...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> <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="660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> <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="667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Recover</source> <translation>Recuperar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Recover...</source> <translation>Recuperar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> <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="674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> <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="695"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> <source>Create .hgignore</source> <translation>Crear .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Create a .hgignore file with default values</source> <translation>Creare un archivo .hgignore con valores por defecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> <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="709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> <source>Create changegroup...</source> <translation>Crear changegroup...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <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="1388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1407"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <source>Apply changegroups...</source> + <translation>Aplicar changegroups...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758"/> + <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="1056"/> + <source>Changegroup Management</source> + <translation>Gestión de Chagegroup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> + <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="761"/> + <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="535"/> + <source>Show current branch</source> + <translation>Mostrar la branch actual</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> + <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="542"/> + <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="769"/> + <source>Mark as "good"</source> + <translation>Marcar como "bueno"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <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="776"/> + <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="783"/> + <source>Mark as "bad"</source> + <translation>Marcar como "malo"</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="787"/> + <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="790"/> + <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="797"/> + <source>Skip</source> + <translation>Saltar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> + <source>Reset</source> + <translation>Reiniciar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <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="818"/> + <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="1069"/> + <source>Bisect</source> + <translation>Bisect</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> + <source>Mark as "good"...</source> + <translation>Marcar como "bueno"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <source>Mark as "bad"...</source> + <translation>Marcar como "malo"...</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> - <source>Apply changegroups...</source> - <translation>Aplicar changegroups...</translation> + <source>Preview changegroup</source> + <translation>Previsualizar changegroup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <source>Preview changegroup...</source> + <translation>Previsualizar changegroup...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <source>Identify</source> + <translation>Identificar</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <source>Identify...</source> + <translation>Identificar...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> + <source>Identify the project directory</source> + <translation>Identificar el directorio de proyecto</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> + <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="743"/> - <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="1044"/> - <source>Changegroup Management</source> - <translation>Gestión de Chagegroup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/> - <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> + <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="746"/> - <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="520"/> - <source>Show current branch</source> - <translation>Mostrar la branch actual</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> - <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="527"/> - <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="754"/> - <source>Mark as "good"</source> - <translation>Marcar como "bueno"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758"/> - <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="761"/> - <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="768"/> - <source>Mark as "bad"</source> - <translation>Marcar como "malo"</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="772"/> - <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="775"/> - <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="782"/> - <source>Skip</source> - <translation>Saltar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> - <source>Reset</source> - <translation>Reiniciar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> - <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="803"/> - <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="1057"/> - <source>Bisect</source> - <translation>Bisect</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> - <source>Mark as "good"...</source> - <translation>Marcar como "bueno"...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> - <source>Mark as "bad"...</source> - <translation>Marcar como "malo"...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> - <source>Preview changegroup</source> - <translation>Previsualizar changegroup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> - <source>Preview changegroup...</source> - <translation>Previsualizar changegroup...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> - <source>Identify</source> - <translation>Identificar</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> - <source>Identify...</source> - <translation>Identificar...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> - <source>Identify the project directory</source> - <translation>Identificar el directorio de proyecto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> - <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="728"/> - <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="731"/> <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> @@ -23106,17 +23111,17 @@ <translation type="obsolete"><b>Identificar changegroup</b><p>Identifica un archivo de changegroup conteniendo una colección de changesets.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source>Back out changeset</source> <translation>Hacer respaldo de changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="814"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <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="817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <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> @@ -23136,317 +23141,317 @@ <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="1035"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047"/> <source>Specials</source> <translation>Especial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> <source>Serve project repository</source> <translation>Servir repositorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> <source>Serve project repository...</source> <translation>Servir repositorio de proyecto...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="870"/> <source>Serve the project repository</source> <translation>Servir el repositorio de proyecto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> <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="1231"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1244"/> <source>Pull</source> <translation>Hacer Pull</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1501"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1518"/> <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="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> <source>Push new branch</source> <translation>Hacer push de nueva rama</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <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="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> <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="824"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> <source>Rollback last transaction</source> <translation>Rollback de última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/> <source>Rollback the last transaction</source> <translation>Rollback de la última transacción</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source>Extensions</source> <translation>Extensiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> <source>Edit user configuration</source> <translation>Editar configuración de usuario</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> <source>Edit user configuration...</source> <translation>Editar configuración de usuario...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <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="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> <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="608"/> - <source>Edit repository configuration</source> - <translation>Editar configuración del repositorio</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> - <source>Edit repository configuration...</source> - <translation>Editar configuración del repositorio...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="612"/> - <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="615"/> - <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="623"/> - <source>Show combined configuration settings</source> - <translation>Mostrar ajustes de configuración combinados</translation> + <source>Edit repository configuration</source> + <translation>Editar configuración del repositorio</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source>Show combined configuration settings...</source> - <translation>Mostrar ajustes de configuración combinados...</translation> + <source>Edit repository configuration...</source> + <translation>Editar configuración del repositorio...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> + <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="630"/> + <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="638"/> + <source>Show combined configuration settings</source> + <translation>Mostrar ajustes de configuración combinados</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <source>Show combined configuration settings...</source> + <translation>Mostrar ajustes de configuración combinados...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> <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="631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> <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="782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source>Skip...</source> <translation>Ignorar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Skip a selectable changeset</source> <translation>Ignorar un changeset seleccionable</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> <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="1446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1463"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> <source>Import Patch...</source> <translation>Importar Patch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="884"/> <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="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> <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="1051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Patch Management</source> <translation>Gestión de Patch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1483"/> <source>Revert Changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> <source>Export Patches...</source> <translation>Exportar Patches...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> <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="889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> <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="896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> <source>Change Phase...</source> <translation>Cambiar Fase...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> <source>Change the phase of revisions</source> <translation>Cambiar la fase de revisiones</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> <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="1486"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1503"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> <source>Copies changesets from another branch</source> <translation>Copiar changesets de otra branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="918"/> - <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="927"/> - <source>Continue Copying Session</source> - <translation>Continuar Sesión de Copia</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/> + <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="940"/> + <source>Continue Copying Session</source> + <translation>Continuar Sesión de Copia</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <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="934"/> - <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 C opia</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="1077"/> - <source>Graft</source> - <translation>Graft</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1501"/> - <source>Copy Changesets (Continue)</source> - <translation>Copiar Changesets (Continuar)</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>Conflicts resolved</source> - <translation>Conflictos resueltos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>Con&flicts resolved</source> - <translation>Con&flictos resueltos</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> - <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="423"/> - <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="942"/> - <source>Add</source> - <translation>Añadir</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> - <source>Add...</source> - <translation>Añadir...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="947"/> + <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 C opia</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="1089"/> + <source>Graft</source> + <translation>Graft</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1518"/> + <source>Copy Changesets (Continue)</source> + <translation>Copiar Changesets (Continuar)</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <source>Conflicts resolved</source> + <translation>Conflictos resueltos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <source>Con&flicts resolved</source> + <translation>Con&flictos resueltos</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <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="438"/> + <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="955"/> + <source>Add</source> + <translation>Añadir</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <source>Add...</source> + <translation>Añadir...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Add a sub-repository</source> <translation>Añadir un sub-repositorio</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> <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="957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> <source>Remove</source> <translation>Eliminar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> <source>Remove...</source> <translation>Eliminar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="962"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Remove sub-repositories</source> <translation>Eliminar sub-repositorios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/> <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="1086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Sub-Repository</source> <translation>Sub-repositorio</translation> </message> @@ -23476,32 +23481,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="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> <source>Create unversioned archive</source> <translation>Crear archivo sin versionar</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> <source>Create unversioned archive...</source> <translation>Crear archivo sin versionar...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> <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="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> <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="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <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="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> <source>Administration</source> <translation>Administración</translation> </message> @@ -23525,6 +23530,21 @@ <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> + <source>Cancel uncommitted merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> + <source>Cancel an uncommitted merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> + <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> </context> <context> <name>HgPurgeListDialog</name>
--- a/i18n/eric5_fr.ts Fri Apr 04 18:07:19 2014 +0200 +++ b/i18n/eric5_fr.ts Fri Apr 04 18:21:47 2014 +0200 @@ -21019,117 +21019,117 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2335"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2408"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> - <source>Shall the working directory be updated?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> - <source>Showing current branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2535"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2615"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/> + <source>Shall the working directory be updated?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2211"/> + <source>Showing current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2565"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2669"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2586"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2432"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/> <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="2701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2731"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2522"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2625"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2791"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2509"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2539"/> <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="2788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2818"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -21139,72 +21139,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3445"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3307"/> <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="3445"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473"/> <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="2858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2933"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2980"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3005"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3033"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3031"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3176"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3209"/> <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="3129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3157"/> <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="3200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3228"/> <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="3200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3228"/> <source>Remove Sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3197"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -21234,7 +21234,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3094"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -21259,7 +21259,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2189"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> @@ -21268,6 +21268,11 @@ <source>Current branch tip</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> + <source>Cancelling uncommitted merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -24634,157 +24639,157 @@ <translation type="obsolete"><b>Résolution des conflits</b><p>Résout tous les conflits VCS du projet local.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <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="431"/> - <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="436"/> - <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="439"/> - <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="446"/> - <source>List tags</source> - <translation type="unfinished">Lister les étiquettes</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <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="451"/> + <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="454"/> + <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="461"/> + <source>List tags</source> + <translation type="unfinished">Lister les étiquettes</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> <source>List tags...</source> <translation type="unfinished">Lister les étiquettes...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465"/> <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="453"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> <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="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> <source>List branches</source> <translation type="unfinished">Lister les branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> <source>List branches...</source> <translation type="unfinished">Lister les branches...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> - <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="467"/> - <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="474"/> - <source>Create branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> - <source>Create &branch...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> - <source>Create a new branch for the local project in the repository</source> - <translation type="unfinished"></translation> + <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="482"/> + <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="489"/> + <source>Create branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> + <source>Create &branch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> + <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="497"/> <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="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>Close branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> <source>Close the current branch of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> <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="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> <source>Switch</source> <translation type="unfinished">Basculer de version</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> <source>S&witch...</source> <translation type="unfinished">&Basculer de version...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> - <source>Switch the working directory to another revision</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> - <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="550"/> - <source>Cleanup</source> - <translation type="unfinished">Nettoyer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Cleanu&p</source> - <translation type="unfinished">&Nettoyer</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> - <source>Cleanup the local project</source> - <translation type="unfinished">Nettoyer le projet local</translation> + <source>Switch the working directory to another revision</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> + <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="565"/> + <source>Cleanup</source> + <translation type="unfinished">Nettoyer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565"/> + <source>Cleanu&p</source> + <translation type="unfinished">&Nettoyer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="569"/> + <source>Cleanup the local project</source> + <translation type="unfinished">Nettoyer le projet local</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> <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="564"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> <source>Execute command</source> <translation type="unfinished">Exécuter une commande</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> <source>E&xecute command...</source> <translation type="unfinished">E&xécuter une commande...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583"/> <source>Execute an arbitrary Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished"></translation> </message> @@ -24799,277 +24804,277 @@ <translation type="obsolete">&Options de commande...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> <source>Configure</source> <translation type="unfinished">Configuration</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> <source>Configure...</source> <translation type="unfinished">Configuration...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> <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="586"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> <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="639"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> <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="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> <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="667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Recover</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="671"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> <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="695"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> <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="709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1407"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <source>Apply changegroups...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758"/> + <source>Apply one or several changegroup files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1056"/> + <source>Changegroup Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> + <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="761"/> + <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="535"/> + <source>Show current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> + <source>Show the current branch of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> + <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="769"/> + <source>Mark as "good"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <source>Mark a selectable changeset as good</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> + <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="783"/> + <source>Mark as "bad"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="787"/> + <source>Mark a selectable changeset as bad</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="790"/> + <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="797"/> + <source>Skip</source> + <translation type="unfinished">Passer</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="811"/> + <source>Reset</source> + <translation type="unfinished">Réinitialiser</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="815"/> + <source>Reset the bisect search data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="818"/> + <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="1069"/> + <source>Bisect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="783"/> + <source>Mark as "bad"...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> - <source>Apply changegroups...</source> + <source>Preview changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <source>Preview changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <source>Identify</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <source>Identify...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> + <source>Identify the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> + <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="743"/> - <source>Apply one or several changegroup files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1044"/> - <source>Changegroup Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/> - <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> + <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="746"/> - <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="520"/> - <source>Show current branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> - <source>Show the current branch of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <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="754"/> - <source>Mark as "good"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758"/> - <source>Mark a selectable changeset as good</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> - <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="768"/> - <source>Mark as "bad"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="772"/> - <source>Mark a selectable changeset as bad</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> - <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="782"/> - <source>Skip</source> - <translation type="unfinished">Passer</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> - <source>Reset</source> - <translation type="unfinished">Réinitialiser</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> - <source>Reset the bisect search data</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/> - <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="1057"/> - <source>Bisect</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> - <source>Mark as "good"...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> - <source>Mark as "bad"...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> - <source>Preview changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> - <source>Preview changegroup...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> - <source>Identify</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> - <source>Identify...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> - <source>Identify the project directory</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> - <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="728"/> - <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="731"/> <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="810"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="825"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="814"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> @@ -25089,317 +25094,317 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1047"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="857"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="870"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="873"/> <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="1231"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1244"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1501"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1518"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="505"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="509"/> <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="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> <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="824"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="843"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1065"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1077"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> <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="601"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> <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="608"/> - <source>Edit repository configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="612"/> - <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="615"/> - <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="623"/> - <source>Show combined configuration settings</source> + <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source>Show combined configuration settings...</source> + <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> + <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="630"/> + <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="638"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="638"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> <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="631"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> <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="782"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="797"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> <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="1446"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1463"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="867"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="871"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="884"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> <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="1051"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1063"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1483"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="886"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="899"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="889"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="902"/> <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="896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="909"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> <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="1486"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1503"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="915"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="928"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="918"/> - <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="927"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/> + <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="940"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> <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="934"/> - <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="1077"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1501"/> - <source>Copy Changesets (Continue)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>Conflicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>Con&flicts resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> - <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="423"/> - <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="942"/> - <source>Add</source> - <translation type="unfinished">Ajouter</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="942"/> - <source>Add...</source> - <translation type="unfinished">Ajouter...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="947"/> + <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="1089"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1518"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <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="438"/> + <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="955"/> + <source>Add</source> + <translation type="unfinished">Ajouter</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <source>Add...</source> + <translation type="unfinished">Ajouter...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> <source>Add a sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> <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="957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> <source>Remove</source> <translation type="unfinished">Supprimer</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="957"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="970"/> <source>Remove...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="962"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="975"/> <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="965"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/> <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="1086"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1098"/> <source>Sub-Repository</source> <translation type="unfinished"></translation> </message> @@ -25429,32 +25434,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="973"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="991"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="981"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> <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="831"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="846"/> <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="1011"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1024"/> <source>Administration</source> <translation type="unfinished"></translation> </message> @@ -25478,6 +25483,21 @@ <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> + <source>Cancel uncommitted merge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> + <source>Cancel an uncommitted merge and lose all changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> + <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> </context> <context> <name>HgPurgeListDialog</name>
--- a/i18n/eric5_it.ts Fri Apr 04 18:07:19 2014 +0200 +++ b/i18n/eric5_it.ts Fri Apr 04 18:21:47 2014 +0200 @@ -19955,92 +19955,92 @@ <translation type="obsolete">Inserisci il nome del Branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> <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="2305"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2335"/> <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="2330"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2360"/> <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="2354"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> <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="2378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2408"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> - <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="2181"/> - <source>Showing current branch</source> - <translation>Visualizzazione branch corrente</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2535"/> - <source>Create changegroup</source> - <translation>Crea changegroup</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2615"/> - <source>Apply changegroups</source> - <translation>Applica changegroup</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/> + <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="2211"/> + <source>Showing current branch</source> + <translation>Visualizzazione branch corrente</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2565"/> + <source>Create changegroup</source> + <translation>Crea changegroup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2645"/> + <source>Apply changegroups</source> + <translation>Applica changegroup</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2669"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2586"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2432"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2468"/> <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="2701"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2731"/> <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="2492"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2522"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2625"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Changegroup Files (*.hg);;All Files (*)</translation> </message> @@ -20050,27 +20050,27 @@ <translation type="obsolete">Identifica i file changegroup</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2791"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2771"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2509"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2539"/> <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="2788"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2818"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -20080,72 +20080,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3445"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3307"/> <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="3445"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3473"/> <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="2858"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2886"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2905"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2933"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2980"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3005"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3033"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3031"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3059"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3176"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3181"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3209"/> <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="3129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3157"/> <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="3200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3228"/> <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="3200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3228"/> <source>Remove Sub-repositories</source> <translation type="unfinished">Rimuovi sotto-archivi</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3169"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3197"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> @@ -20175,7 +20175,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3094"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> @@ -20200,7 +20200,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2189"/> <source>Created new branch <{0}>.</source> <translation type="unfinished"></translation> </message> @@ -20209,6 +20209,11 @@ <source>Current branch tip</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> + <source>Cancelling uncommitted merge</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> @@ -23643,157 +23648,157 @@ <translation type="obsolete"><b>Risolve conflitti</b><p>Risolve tutti i conflitti del progetto locale.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>Tag in repository</source> <translation>Tag nel repository</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> - <source>&Tag in repository...</source> - <translation>&Tag nel repository...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> - <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="439"/> - <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="446"/> - <source>List tags</source> - <translation>Elenca tag</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <source>&Tag in repository...</source> + <translation>&Tag nel repository...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="451"/> + <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="454"/> + <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="461"/> + <source>List tags</source> + <translation>Elenca tag</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> <source>List tags...</source> <translation>Elenca tag...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="465"/> <source>List tags of the project</source> <translation>Elenca i tag del progetto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> <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="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> <source>List branches</source> <translation>Elenca branches</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="475"/> <source>List branches...</source> <translation>Elenca branches...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> - <source>List branches of the project</source> - <translation>Elenca i branches del progetto</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> - <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="474"/> - <source>Create branch</source> - <translation>Crea Branch</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> - <source>Create &branch...</source> - <translation>Crea &Branch...</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> - <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> + <source>List branches of the project</source> + <translation>Elenca i branches del progetto</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> + <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="489"/> + <source>Create branch</source> + <translation>Crea Branch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="489"/> + <source>Create &branch...</source> + <translation>Crea &Branch...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> + <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="497"/> <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="506"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> <source>Close branch</source> <translation>Chiudi branch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="525"/> <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="513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> <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="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> <source>Switch</source> <translation>Switch</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="549"/> <source>S&witch...</source> <translation>S&witch...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> - <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="542"/> - <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="550"/> - <source>Cleanup</source> - <translation>Pulisci</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> - <source>Cleanu&p</source> - <translation>&Pulisci</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> - <source>Cleanup the local project</source> - <translation>Pulisci il progetto locale</translation> + <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="557"/> + <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="565"/> + <source>Cleanup</source> + <translation>Pulisci</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565"/> + <source>Cleanu&p</source> + <translation>&Pulisci</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="569"/> + <source>Cleanup the local project</source> + <translation>Pulisci il progetto locale</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="572"/> <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="564"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> <source>Execute command</source> <translation>Esegui comando</translation>