Mercurial Repositories > eric / changeset
changeset
Added an entry to the Mercurial menu to edit the user configuration file.
Fri, 27 May 2011 19:10:22 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Fri, 27 May 2011 19:10:22 +0200
- changeset 1064
- 10bdbb173c0f
- parent 1063
- a0afd409c566
- child 1066
- a3dd41fd9ea8
Added an entry to the Mercurial menu to edit the user configuration file.
--- a/APIs/Python3/eric5.api Fri May 27 18:22:07 2011 +0200 +++ b/APIs/Python3/eric5.api Fri May 27 19:10:22 2011 +0200 @@ -3546,6 +3546,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgCopy?4(name, project) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgCreateIgnoreFile?4(name, autoAdd=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgEditConfig?4(name) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgEditUserConfig?4() eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgExtendedDiff?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgForget?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgGetBranchesList?4(repodir)
--- a/Documentation/Help/source.qhp Fri May 27 18:22:07 2011 +0200 +++ b/Documentation/Help/source.qhp Fri May 27 19:10:22 2011 +0200 @@ -8380,6 +8380,7 @@ <keyword name="Hg.hgCopy" id="Hg.hgCopy" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgCopy" /> <keyword name="Hg.hgCreateIgnoreFile" id="Hg.hgCreateIgnoreFile" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgCreateIgnoreFile" /> <keyword name="Hg.hgEditConfig" id="Hg.hgEditConfig" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgEditConfig" /> + <keyword name="Hg.hgEditUserConfig" id="Hg.hgEditUserConfig" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgEditUserConfig" /> <keyword name="Hg.hgExtendedDiff" id="Hg.hgExtendedDiff" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgExtendedDiff" /> <keyword name="Hg.hgForget" id="Hg.hgForget" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgForget" /> <keyword name="Hg.hgGetBranchesList" id="Hg.hgGetBranchesList" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgGetBranchesList" /> @@ -8484,6 +8485,7 @@ <keyword name="HgProjectHelper.__hgConfigure" id="HgProjectHelper.__hgConfigure" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgConfigure" /> <keyword name="HgProjectHelper.__hgCreateIgnore" id="HgProjectHelper.__hgCreateIgnore" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgCreateIgnore" /> <keyword name="HgProjectHelper.__hgEditRepoConfig" id="HgProjectHelper.__hgEditRepoConfig" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgEditRepoConfig" /> + <keyword name="HgProjectHelper.__hgEditUserConfig" id="HgProjectHelper.__hgEditUserConfig" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgEditUserConfig" /> <keyword name="HgProjectHelper.__hgExtendedDiff" id="HgProjectHelper.__hgExtendedDiff" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgExtendedDiff" /> <keyword name="HgProjectHelper.__hgHeads" id="HgProjectHelper.__hgHeads" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgHeads" /> <keyword name="HgProjectHelper.__hgIdentify" id="HgProjectHelper.__hgIdentify" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgIdentify" />
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html Fri May 27 18:22:07 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.BookmarksExtension.ProjectHelper.html Fri May 27 19:10:22 2011 +0200 @@ -146,7 +146,7 @@ <h4>BookmarksProjectHelper.__hgBookmarksList</h4> <b>__hgBookmarksList</b>(<i></i>) <p> - Private slot used to list the bookmarks. + Private slot used to list the bookmarks. </p><a NAME="BookmarksProjectHelper.getActions" ID="BookmarksProjectHelper.getActions"></a> <h4>BookmarksProjectHelper.getActions</h4> <b>getActions</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html Fri May 27 18:22:07 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html Fri May 27 19:10:22 2011 +0200 @@ -58,7 +58,7 @@ <td>Constructor</td> </tr><tr> <td><a href="#MercurialPage.on_configButton_clicked">on_configButton_clicked</a></td> -<td>Private slot to edit the (per user) Mercurial config file.</td> +<td>Private slot to edit the (per user) Mercurial configuration file.</td> </tr><tr> <td><a href="#MercurialPage.save">save</a></td> <td>Public slot to save the Mercurial configuration.</td> @@ -78,7 +78,7 @@ <h4>MercurialPage.on_configButton_clicked</h4> <b>on_configButton_clicked</b>(<i></i>) <p> - Private slot to edit the (per user) Mercurial config file. + Private slot to edit the (per user) Mercurial configuration file. </p><a NAME="MercurialPage.save" ID="MercurialPage.save"></a> <h4>MercurialPage.save</h4> <b>save</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Fri May 27 18:22:07 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Fri May 27 19:10:22 2011 +0200 @@ -91,7 +91,10 @@ <td>Private slot used to create a .hgignore file for the project.</td> </tr><tr> <td><a href="#HgProjectHelper.__hgEditRepoConfig">__hgEditRepoConfig</a></td> -<td>Private slot used to edit the repository config file.</td> +<td>Private slot used to edit the repository configuration file.</td> +</tr><tr> +<td><a href="#HgProjectHelper.__hgEditUserConfig">__hgEditUserConfig</a></td> +<td>Private slot used to edit the repository configuration file.</td> </tr><tr> <td><a href="#HgProjectHelper.__hgExtendedDiff">__hgExtendedDiff</a></td> <td>Private slot used to perform a hg diff with the selection of revisions.</td> @@ -151,7 +154,7 @@ <td>Private slot used to show the current branch for the project.</td> </tr><tr> <td><a href="#HgProjectHelper.__hgShowConfig">__hgShowConfig</a></td> -<td>Private slot used to show the combined config.</td> +<td>Private slot used to show the combined configuration.</td> </tr><tr> <td><a href="#HgProjectHelper.__hgShowPaths">__hgShowPaths</a></td> <td>Private slot used to show the aliases for remote repositories.</td> @@ -262,7 +265,12 @@ <h4>HgProjectHelper.__hgEditRepoConfig</h4> <b>__hgEditRepoConfig</b>(<i></i>) <p> - Private slot used to edit the repository config file. + Private slot used to edit the repository configuration file. +</p><a NAME="HgProjectHelper.__hgEditUserConfig" ID="HgProjectHelper.__hgEditUserConfig"></a> +<h4>HgProjectHelper.__hgEditUserConfig</h4> +<b>__hgEditUserConfig</b>(<i></i>) +<p> + Private slot used to edit the repository configuration file. </p><a NAME="HgProjectHelper.__hgExtendedDiff" ID="HgProjectHelper.__hgExtendedDiff"></a> <h4>HgProjectHelper.__hgExtendedDiff</h4> <b>__hgExtendedDiff</b>(<i></i>) @@ -363,7 +371,7 @@ <h4>HgProjectHelper.__hgShowConfig</h4> <b>__hgShowConfig</b>(<i></i>) <p> - Private slot used to show the combined config. + Private slot used to show the combined configuration. </p><a NAME="HgProjectHelper.__hgShowPaths" ID="HgProjectHelper.__hgShowPaths"></a> <h4>HgProjectHelper.__hgShowPaths</h4> <b>__hgShowPaths</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html Fri May 27 18:22:07 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html Fri May 27 19:10:22 2011 +0200 @@ -289,41 +289,41 @@ <h4>QueuesProjectHelper.__hgQueueNewPatch</h4> <b>__hgQueueNewPatch</b>(<i></i>) <p> - Private slot used to create a new named patch. + Private slot used to create a new named patch. </p><a NAME="QueuesProjectHelper.__hgQueuePopAllPatches" ID="QueuesProjectHelper.__hgQueuePopAllPatches"></a> <h4>QueuesProjectHelper.__hgQueuePopAllPatches</h4> <b>__hgQueuePopAllPatches</b>(<i></i>) <p> - Private slot used to pop all patches off the stack. + Private slot used to pop all patches off the stack. </p><a NAME="QueuesProjectHelper.__hgQueuePopAllPatchesForced" ID="QueuesProjectHelper.__hgQueuePopAllPatchesForced"></a> <h4>QueuesProjectHelper.__hgQueuePopAllPatchesForced</h4> <b>__hgQueuePopAllPatchesForced</b>(<i></i>) <p> Private slot used to pop all patches off the stack forgetting - any local changes to patched files. + any local changes to patched files. </p><a NAME="QueuesProjectHelper.__hgQueuePopPatch" ID="QueuesProjectHelper.__hgQueuePopPatch"></a> <h4>QueuesProjectHelper.__hgQueuePopPatch</h4> <b>__hgQueuePopPatch</b>(<i></i>) <p> - Private slot used to pop the current patch off the stack. + Private slot used to pop the current patch off the stack. </p><a NAME="QueuesProjectHelper.__hgQueuePopPatchForced" ID="QueuesProjectHelper.__hgQueuePopPatchForced"></a> <h4>QueuesProjectHelper.__hgQueuePopPatchForced</h4> <b>__hgQueuePopPatchForced</b>(<i></i>) <p> Private slot used to pop the current patch off the stack forgetting - any local changes to patched files. + any local changes to patched files. </p><a NAME="QueuesProjectHelper.__hgQueuePopPatches" ID="QueuesProjectHelper.__hgQueuePopPatches"></a> <h4>QueuesProjectHelper.__hgQueuePopPatches</h4> <b>__hgQueuePopPatches</b>(<i></i>) <p> Private slot used to pop patches off the stack until a named - one is at the top. + one is at the top. </p><a NAME="QueuesProjectHelper.__hgQueuePopPatchesForced" ID="QueuesProjectHelper.__hgQueuePopPatchesForced"></a> <h4>QueuesProjectHelper.__hgQueuePopPatchesForced</h4> <b>__hgQueuePopPatchesForced</b>(<i></i>) <p> Private slot used to pop patches off the stack until a named - one is at the top forgetting any local changes to patched files. + one is at the top forgetting any local changes to patched files. </p><a NAME="QueuesProjectHelper.__hgQueuePurgeQueue" ID="QueuesProjectHelper.__hgQueuePurgeQueue"></a> <h4>QueuesProjectHelper.__hgQueuePurgeQueue</h4> <b>__hgQueuePurgeQueue</b>(<i></i>) @@ -334,46 +334,46 @@ <h4>QueuesProjectHelper.__hgQueuePushAllPatches</h4> <b>__hgQueuePushAllPatches</b>(<i></i>) <p> - Private slot used to push all patches onto the stack. + Private slot used to push all patches onto the stack. </p><a NAME="QueuesProjectHelper.__hgQueuePushAllPatchesForced" ID="QueuesProjectHelper.__hgQueuePushAllPatchesForced"></a> <h4>QueuesProjectHelper.__hgQueuePushAllPatchesForced</h4> <b>__hgQueuePushAllPatchesForced</b>(<i></i>) <p> Private slot used to push all patches onto the stack on top - of local changes. + of local changes. </p><a NAME="QueuesProjectHelper.__hgQueuePushPatch" ID="QueuesProjectHelper.__hgQueuePushPatch"></a> <h4>QueuesProjectHelper.__hgQueuePushPatch</h4> <b>__hgQueuePushPatch</b>(<i></i>) <p> - Private slot used to push the next patch onto the stack. + Private slot used to push the next patch onto the stack. </p><a NAME="QueuesProjectHelper.__hgQueuePushPatchForced" ID="QueuesProjectHelper.__hgQueuePushPatchForced"></a> <h4>QueuesProjectHelper.__hgQueuePushPatchForced</h4> <b>__hgQueuePushPatchForced</b>(<i></i>) <p> Private slot used to push the next patch onto the stack on top - of local changes. + of local changes. </p><a NAME="QueuesProjectHelper.__hgQueuePushPatches" ID="QueuesProjectHelper.__hgQueuePushPatches"></a> <h4>QueuesProjectHelper.__hgQueuePushPatches</h4> <b>__hgQueuePushPatches</b>(<i></i>) <p> Private slot used to push patches onto the stack until a named - one is at the top. + one is at the top. </p><a NAME="QueuesProjectHelper.__hgQueuePushPatchesForced" ID="QueuesProjectHelper.__hgQueuePushPatchesForced"></a> <h4>QueuesProjectHelper.__hgQueuePushPatchesForced</h4> <b>__hgQueuePushPatchesForced</b>(<i></i>) <p> Private slot used to push patches onto the stack until a named - one is at the top on top of local changes. + one is at the top on top of local changes. </p><a NAME="QueuesProjectHelper.__hgQueueRefreshPatch" ID="QueuesProjectHelper.__hgQueueRefreshPatch"></a> <h4>QueuesProjectHelper.__hgQueueRefreshPatch</h4> <b>__hgQueueRefreshPatch</b>(<i></i>) <p> - Private slot used to refresh the current patch. + Private slot used to refresh the current patch. </p><a NAME="QueuesProjectHelper.__hgQueueRefreshPatchMessage" ID="QueuesProjectHelper.__hgQueueRefreshPatchMessage"></a> <h4>QueuesProjectHelper.__hgQueueRefreshPatchMessage</h4> <b>__hgQueueRefreshPatchMessage</b>(<i></i>) <p> - Private slot used to refresh the current patch and it's commit message. + Private slot used to refresh the current patch and it's commit message. </p><a NAME="QueuesProjectHelper.__hgQueueRenamePatch" ID="QueuesProjectHelper.__hgQueueRenamePatch"></a> <h4>QueuesProjectHelper.__hgQueueRenamePatch</h4> <b>__hgQueueRenamePatch</b>(<i></i>) @@ -388,12 +388,12 @@ <h4>QueuesProjectHelper.__hgQueueShowHeader</h4> <b>__hgQueueShowHeader</b>(<i></i>) <p> - Private slot used to show the commit message of the current patch. + Private slot used to show the commit message of the current patch. </p><a NAME="QueuesProjectHelper.__hgQueueShowPatch" ID="QueuesProjectHelper.__hgQueueShowPatch"></a> <h4>QueuesProjectHelper.__hgQueueShowPatch</h4> <b>__hgQueueShowPatch</b>(<i></i>) <p> - Private slot used to show the contents of the current patch. + Private slot used to show the contents of the current patch. </p><a NAME="QueuesProjectHelper.__initGuardsActions" ID="QueuesProjectHelper.__initGuardsActions"></a> <h4>QueuesProjectHelper.__initGuardsActions</h4> <b>__initGuardsActions</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Fri May 27 18:22:07 2011 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Fri May 27 19:10:22 2011 +0200 @@ -70,10 +70,10 @@ <td>Private method to format a url for Mercurial.</td> </tr><tr> <td><a href="#Hg.__iniFileChanged">__iniFileChanged</a></td> -<td>Private slot to handle a change of the Mercurial config file.</td> +<td>Private slot to handle a change of the Mercurial configuration file.</td> </tr><tr> <td><a href="#Hg.__monitorRepoIniFile">__monitorRepoIniFile</a></td> -<td>Private slot to add a repository config file to the list of monitored files.</td> +<td>Private slot to add a repository configuration file to the list of monitored files.</td> </tr><tr> <td><a href="#Hg.__vcsCommit_Step2">__vcsCommit_Step2</a></td> <td>Private slot performing the second step of the commit action.</td> @@ -112,7 +112,10 @@ <td>Public method to create the ignore file.</td> </tr><tr> <td><a href="#Hg.hgEditConfig">hgEditConfig</a></td> -<td>Public method used to edit the repository config file.</td> +<td>Public method used to edit the repository configuration file.</td> +</tr><tr> +<td><a href="#Hg.hgEditUserConfig">hgEditUserConfig</a></td> +<td>Public method used to edit the user configuration file.</td> </tr><tr> <td><a href="#Hg.hgExtendedDiff">hgExtendedDiff</a></td> <td>Public method used to view the difference of a file/directory to the Mercurial repository.</td> @@ -172,13 +175,13 @@ <td>Public method used to rollback the last transaction.</td> </tr><tr> <td><a href="#Hg.hgServe">hgServe</a></td> -<td>Public method used to edit the repository config file.</td> +<td>Public method used to serve the project.</td> </tr><tr> <td><a href="#Hg.hgShowBranch">hgShowBranch</a></td> <td>Public method used to show the current branch the working directory.</td> </tr><tr> <td><a href="#Hg.hgShowConfig">hgShowConfig</a></td> -<td>Public method to show the combined config.</td> +<td>Public method to show the combined configuration.</td> </tr><tr> <td><a href="#Hg.hgShowPaths">hgShowPaths</a></td> <td>Public method to show the path aliases for remote repositories.</td> @@ -326,7 +329,7 @@ <h4>Hg.__iniFileChanged</h4> <b>__iniFileChanged</b>(<i>path</i>) <p> - Private slot to handle a change of the Mercurial config file. + Private slot to handle a change of the Mercurial configuration file. </p><dl> <dt><i>path</i></dt> <dd> @@ -336,7 +339,8 @@ <h4>Hg.__monitorRepoIniFile</h4> <b>__monitorRepoIniFile</b>(<i>name</i>) <p> - Private slot to add a repository config file to the list of monitored files. + Private slot to add a repository configuration file to the list of monitored + files. </p><dl> <dt><i>name</i></dt> <dd> @@ -374,7 +378,7 @@ <h4>Hg.getExtensionObject</h4> <b>getExtensionObject</b>(<i>extensionName</i>) <p> - Public method to get a reference to an extension object. + Public method to get a reference to an extension object. </p><dl> <dt><i>extensionName</i></dt> <dd> @@ -489,13 +493,18 @@ <h4>Hg.hgEditConfig</h4> <b>hgEditConfig</b>(<i>name</i>) <p> - Public method used to edit the repository config file. + Public method used to edit the repository configuration file. </p><dl> <dt><i>name</i></dt> <dd> file/directory name (string) </dd> -</dl><a NAME="Hg.hgExtendedDiff" ID="Hg.hgExtendedDiff"></a> +</dl><a NAME="Hg.hgEditUserConfig" ID="Hg.hgEditUserConfig"></a> +<h4>Hg.hgEditUserConfig</h4> +<b>hgEditUserConfig</b>(<i></i>) +<p> + Public method used to edit the user configuration file. +</p><a NAME="Hg.hgExtendedDiff" ID="Hg.hgExtendedDiff"></a> <h4>Hg.hgExtendedDiff</h4> <b>hgExtendedDiff</b>(<i>name</i>) <p> @@ -737,7 +746,7 @@ <h4>Hg.hgServe</h4> <b>hgServe</b>(<i>name</i>) <p> - Public method used to edit the repository config file. + Public method used to serve the project. </p><dl> <dt><i>name</i></dt> <dd> @@ -757,7 +766,7 @@ <h4>Hg.hgShowConfig</h4> <b>hgShowConfig</b>(<i>name</i>) <p> - Public method to show the combined config. + Public method to show the combined configuration. </p><dl> <dt><i>name</i></dt> <dd>
--- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Fri May 27 18:22:07 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Fri May 27 19:10:22 2011 +0200 @@ -49,7 +49,7 @@ @pyqtSlot() def on_configButton_clicked(self): """ - Private slot to edit the (per user) Mercurial config file. + Private slot to edit the (per user) Mercurial configuration file. """ cfgFile = self.__plugin.getConfigPath() editor = MiniEditor(cfgFile, "Properties", self)
--- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui Fri May 27 18:22:07 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui Fri May 27 19:10:22 2011 +0200 @@ -159,10 +159,10 @@ <item> <widget class="QPushButton" name="configButton"> <property name="toolTip"> - <string>Edit the mercurial config file</string> + <string>Edit the Mercurial configuration file</string> </property> <property name="text"> - <string>Edit config file</string> + <string>Edit configuration file</string> </property> </widget> </item>
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Fri May 27 18:22:07 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Fri May 27 19:10:22 2011 +0200 @@ -558,28 +558,43 @@ self.hgConfigAct.triggered[()].connect(self.__hgConfigure) self.actions.append(self.hgConfigAct) - self.hgRepoConfigAct = E5Action(self.trUtf8('Edit repository config'), - self.trUtf8('Edit repository config...'), + self.hgEditUserConfigAct = E5Action(self.trUtf8('Edit user configuration'), + self.trUtf8('Edit user configuration...'), + 0, 0, self, 'mercurial_user_configure') + self.hgEditUserConfigAct.setStatusTip(self.trUtf8( + 'Show an editor to edit the user configuration file' + )) + self.hgEditUserConfigAct.setWhatsThis(self.trUtf8( + """<b>Edit user configuration</b>""" + """<p>Show an editor to edit the user configuration file.</p>""" + )) + self.hgEditUserConfigAct.triggered[()].connect(self.__hgEditUserConfig) + self.actions.append(self.hgEditUserConfigAct) + + self.hgRepoConfigAct = E5Action(self.trUtf8('Edit repository configuration'), + self.trUtf8('Edit repository configuration...'), 0, 0, self, 'mercurial_repo_configure') self.hgRepoConfigAct.setStatusTip(self.trUtf8( - 'Show an editor to edit the repository config file' + 'Show an editor to edit the repository configuration file' )) self.hgRepoConfigAct.setWhatsThis(self.trUtf8( - """<b>Edit repository config</b>""" - """<p>Show an editor to edit the repository config file.</p>""" + """<b>Edit repository configuration</b>""" + """<p>Show an editor to edit the repository configuration file.</p>""" )) self.hgRepoConfigAct.triggered[()].connect(self.__hgEditRepoConfig) self.actions.append(self.hgRepoConfigAct) - self.hgShowConfigAct = E5Action(self.trUtf8('Show combined config settings'), - self.trUtf8('Show combined config settings...'), + self.hgShowConfigAct = E5Action( + self.trUtf8('Show combined configuration settings'), + self.trUtf8('Show combined configuration settings...'), 0, 0, self, 'mercurial_show_config') self.hgShowConfigAct.setStatusTip(self.trUtf8( - 'Show the combined config settings from all config files' + 'Show the combined configuration settings from all configuration files' )) self.hgShowConfigAct.setWhatsThis(self.trUtf8( - """<b>Show combined config settings</b>""" - """<p>This shows the combined config settings from all config files.</p>""" + """<b>Show combined configuration settings</b>""" + """<p>This shows the combined configuration settings""" + """ from all configuration files.</p>""" )) self.hgShowConfigAct.triggered[()].connect(self.__hgShowConfig) self.actions.append(self.hgShowConfigAct) @@ -922,6 +937,7 @@ menu.addSeparator() menu.addAction(self.vcsPropsAct) menu.addSeparator() + menu.addAction(self.hgEditUserConfigAct) menu.addAction(self.hgConfigAct) def __showExtensionMenu(self): @@ -1058,15 +1074,21 @@ """ self.vcs.hgPush(self.project.ppath, newBranch=True) + def __hgEditUserConfig(self): + """ + Private slot used to edit the repository configuration file. + """ + self.vcs.hgEditUserConfig() + def __hgEditRepoConfig(self): """ - Private slot used to edit the repository config file. + Private slot used to edit the repository configuration file. """ self.vcs.hgEditConfig(self.project.ppath) def __hgShowConfig(self): """ - Private slot used to show the combined config. + Private slot used to show the combined configuration. """ self.vcs.hgShowConfig(self.project.ppath)
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Fri May 27 18:22:07 2011 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Fri May 27 19:10:22 2011 +0200 @@ -115,8 +115,10 @@ self.status = None self.tagbranchList = None self.annotate = None - self.editor = None + self.repoEditor = None + self.userEditor = None self.serveDlg = None + self.bundleFile = None self.statusCache = {} @@ -164,6 +166,10 @@ self.annotate.close() if self.serveDlg is not None: self.serveDlg.close() + if self.repoEditor is not None: + self.repoEditor.close() + if self.userEditor is not None: + self.userEditor.close() if self.bundleFile and os.path.exists(self.bundleFile): os.remove(self.bundleFile) @@ -1659,9 +1665,17 @@ if res: dia.exec_() + def hgEditUserConfig(self): + """ + Public method used to edit the user configuration file. + """ + cfgFile = getConfigPath() + self.userEditor = MiniEditor(cfgFile, "Properties") + self.userEditor.show() + def hgEditConfig(self, name): """ - Public method used to edit the repository config file. + Public method used to edit the repository configuration file. @param name file/directory name (string) """ @@ -1681,8 +1695,8 @@ cfg.close() except IOError: pass - self.editor = MiniEditor(cfgFile, "Properties") - self.editor.show() + self.repoEditor = MiniEditor(cfgFile, "Properties") + self.repoEditor.show() def hgVerify(self, name): """ @@ -1709,7 +1723,7 @@ def hgShowConfig(self, name): """ - Public method to show the combined config. + Public method to show the combined configuration. @param name file/directory name (string) """ @@ -2177,7 +2191,7 @@ def hgServe(self, name): """ - Public method used to edit the repository config file. + Public method used to serve the project. @param name directory name (string) """ @@ -2199,7 +2213,7 @@ def __iniFileChanged(self, path): """ - Private slot to handle a change of the Mercurial config file. + Private slot to handle a change of the Mercurial configuration file. @param path name of the changed file (string) """ @@ -2207,7 +2221,8 @@ def __monitorRepoIniFile(self, name): """ - Private slot to add a repository config file to the list of monitored files. + Private slot to add a repository configuration file to the list of monitored + files. @param name directory name pointing into the repository (string) """
--- a/i18n/eric5_cs.ts Fri May 27 18:22:07 2011 +0200 +++ b/i18n/eric5_cs.ts Fri May 27 19:10:22 2011 +0200 @@ -15360,212 +15360,212 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="205"/> <source>The hg process finished with the exit code {0}</source> <translation>hg proces skončil s exit kódem {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="208"/> <source>The hg process did not finish within 30s.</source> <translation>hg proces neskončil do 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="210"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>Create project repository</source> <translation>Vytvořit repozitář projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>The project repository could not be created.</source> <translation>Úložiště projektu nelze vytvořit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="257"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="263"/> <source>Creating Mercurial repository</source> <translation>Vytváření Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <source>Initial commit to Mercurial repository</source> <translation>Úvodní zápis změn (commit) do Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> <source>Cloning project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="409"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="415"/> <source>Commiting changes to Mercurial repository</source> <translation>Zapsání změn (commit) do Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="463"/> <source>Synchronizing with the Mercurial repository</source> <translation>Synchronizovat s Mercurial úložištěm</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="505"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="511"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Přidat soubory/složky do Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="565"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Odebrat soubory/složky z Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="629"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="728"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="734"/> <source>Taging in the Mercurial repository</source> <translation>Otagovat Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="758"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="764"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="806"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="812"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1025"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1031"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1208"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1386"/> <source>Mercurial Log</source> <translation>Mercurial log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1386"/> <source>Select number of entries to show.</source> <translation>Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1455"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1461"/> <source>Pulling from a remote Mercurial repository</source> <translation>Stažení (pull) z Mercurial repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1487"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1493"/> <source>Pushing to a remote Mercurial repository</source> <translation>Odeslání (push) do Mercurial repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1607"/> <source>Resolving files/directories</source> <translation>Vyřešení souborů/složek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Create Branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Enter branch name</source> <translation>Zadejte název větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1634"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <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="1705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <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="1729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1766"/> <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="1775"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2015"/> <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="1657"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1663"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1927"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> - <source>Apply changegroups</source> - <translation>Použít skupinu změn</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <source>Apply changegroups</source> + <translation>Použít skupinu změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2040"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2074"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1965"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1979"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837"/> <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="2092"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2106"/> <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="1874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1888"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -15575,37 +15575,37 @@ <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="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2009"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Identifying changegroup file</source> <translation>Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> <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="1891"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <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="2173"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2187"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2168"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -17991,165 +17991,165 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> <source>Edit repository config</source> - <translation>Editovat konfiguraci repozitáře</translation> + <translation type="obsolete">Editovat konfiguraci repozitáře</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> <source>Edit repository config...</source> - <translation>Editovat konfiguraci repozitáře...</translation> + <translation type="obsolete">Editovat konfiguraci repozitáře...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> <source>Show an editor to edit the repository config file</source> - <translation>Zobrazit editor pro editaci konfiguračního souboru repozitáře</translation> + <translation type="obsolete">Zobrazit editor pro editaci konfiguračního souboru repozitáře</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> <source><b>Edit repository config</b><p>Show an editor to edit the repository config file.</p></source> - <translation><b>Zobrazit konfiguraci repozitáře</b><p>Zobrazí editor pro editaci konfiguračního souboru repozitáře.</p></translation> + <translation type="obsolete"><b>Zobrazit konfiguraci repozitáře</b><p>Zobrazí editor pro editaci konfiguračního souboru repozitáře.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source>Show combined config settings</source> - <translation>Zobrazit kombinovaná nastavení konfigurace</translation> + <translation type="obsolete">Zobrazit kombinovaná nastavení konfigurace</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source>Show combined config settings...</source> - <translation>Zobrazit kombinovaná nastavení konfigurace...</translation> + <translation type="obsolete">Zobrazit kombinovaná nastavení konfigurace...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> <source>Show the combined config settings from all config files</source> - <translation>Zobrazit kombinovaná nastavení ze všech konfigurací</translation> + <translation type="obsolete">Zobrazit kombinovaná nastavení ze všech konfigurací</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> <source><b>Show combined config settings</b><p>This shows the combined config settings from all config files.</p></source> - <translation><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="587"/> + <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="602"/> <source>Show paths</source> <translation>Zobrazit cesty</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show paths...</source> <translation>Zobrazit cesty...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> <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="593"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> <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="600"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository</source> <translation>Ověřit repozitář</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository...</source> <translation>Ověřit repozitář...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <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="606"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> <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="613"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover</source> <translation>Zotavit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover...</source> <translation>Zotavit...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> <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="619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Zotavit</b><p>Obnoví integritu repozitáře narušenou přerušenou transakcí.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834"/> <source>Repository Administration</source> <translation>Administrace repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source>Create .hgignore</source> <translation>Vytvořit .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> <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="645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> <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="652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup...</source> <translation>Vytvořit skupinu změn...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <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="694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups...</source> <translation>Použít skupinu změn...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> <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="845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> <source>Changegroup Management</source> <translation>Správa skupin změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <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="700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <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> @@ -18169,152 +18169,152 @@ <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="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"</source> <translation>Označit jako "v pořádku"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <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="714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <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="721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <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>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="727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <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="734"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source>Skip</source> <translation>Přeskočit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Skip the current changeset</source> <translation>Přeskočit aktuální množinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation><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="747"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Reset</source> <translation>Reset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Reset the bisect search data</source> <translation>Reset vyhledávání bisect</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <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="851"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"...</source> <translation>Označit jako "v pořádku"...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"...</source> <translation>Označit jako "špatná"...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup...</source> <translation>Náhled skupiny změn...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify</source> <translation>Identifikovat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify...</source> <translation>Identifikovat...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Identify the project directory</source> <translation>Identifikovat adresář projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <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="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <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="672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Náhled skupiny změn</b><p>Zobrazí náhled souboru skupiny změn obsahující množiny změn.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup</source> <translation>Identifikovat skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup...</source> <translation>Identifikovat skupinu změn...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation>Identifikuje soubor se skupinou změn obsahující množinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation><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="760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Back out changeset</source> <translation>Vycouvat z množiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <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="766"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <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> @@ -18334,37 +18334,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> <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="840"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> <source>Pull</source> <translation type="unfinished">Stáhnout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> @@ -18384,25 +18384,85 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <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="857"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <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="567"/> + <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="574"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <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="580"/> + <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="587"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <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="594"/> + <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> </context> <context> <name>HgQueuesDefineGuardsDialog</name> @@ -22889,12 +22949,12 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> <source>Edit the mercurial config file</source> - <translation>Editovat mercurial konfigurační soubor</translation> + <translation type="obsolete">Editovat mercurial konfigurační soubor</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> <source>Edit config file</source> - <translation>Edit konfig. soubor</translation> + <translation type="obsolete">Edit konfig. soubor</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/> @@ -22911,6 +22971,16 @@ <source>Update after pulling</source> <translation>Aktualizovat po stažení</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <source>Edit the Mercurial configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> + <source>Edit configuration file</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -47804,30 +47874,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1078"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1084"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Rodič #{0}</b></td><td></td></tr><tr><td><b>Množina změn</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1556"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tagy</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1558"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Větve</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1100"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1124"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -47838,23 +47908,23 @@ <translation><h3>Informace o repozitáře</h3><p><table><tr><td><b>Mercurial V.</b></td><td>{0}</td></tr><tr></tr><tr><td><b>URL</b></td><td>{1}</td></tr></table></p>{2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1544"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1546"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1552"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Množina změn</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Rodiče</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1565"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1571"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -47862,7 +47932,7 @@ <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1554"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_de.ts Fri May 27 18:22:07 2011 +0200 +++ b/i18n/eric5_de.ts Fri May 27 19:10:22 2011 +0200 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="de"> +<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -1641,8 +1640,8 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="140"/> - <source>Open in New &Tab Ctrl+LMB</source> - <translation>In neuem &Register öffnen Strg+LMK</translation> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> + <translation>In neuem &Register öffnen<byte value="x9"/>Strg+LMK</translation> </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="146"/> @@ -1860,7 +1859,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="73"/> - <source>Open in New &Tab Ctrl+LMB</source> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -12393,7 +12392,7 @@ </message> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="799"/> - <source>Open Link in New Tab Ctrl+LMB</source> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> <translation>Link in neuem Fenster öffnen\tStrg+LMK</translation> </message> <message> @@ -15105,247 +15104,247 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="205"/> <source>The hg process finished with the exit code {0}</source> <translation>Der hg Prozess endete mit dem Code {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="208"/> <source>The hg process did not finish within 30s.</source> <translation>Der hg Prozess endete nicht innerhalb von 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="210"/> <source>Could not start the hg executable.</source> <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>The project repository could not be created.</source> <translation>Das Projektrepository konnte nicht erzeugt werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="257"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="263"/> <source>Creating Mercurial repository</source> <translation>Lege Mercurial Repository an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <source>Initial commit to Mercurial repository</source> <translation>Erstes Commit für das Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> <source>Cloning project from a Mercurial repository</source> <translation>Klone das Projekt aus dem Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="409"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="415"/> <source>Commiting changes to Mercurial repository</source> <translation>Pflege Änderungen in das Mercurial Repository ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="463"/> <source>Synchronizing with the Mercurial repository</source> <translation>Gleiche mit dem Mercurial Repository ab</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="505"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="511"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Füge Dateien/Verzeichnisse dem Mercurial Repository hinzu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="565"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Lösche Dateien/Verzeichnisse aus dem Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="629"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="728"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="734"/> <source>Taging in the Mercurial repository</source> <translation>Marke im Mercurial Repository setzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="758"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="764"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="806"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="812"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1025"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1031"/> <source>Mercurial command</source> <translation>Mercurial Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1208"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1386"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1386"/> <source>Select number of entries to show.</source> <translation>Wähle Anzahl der anzuzeigenden Einträge.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1455"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1461"/> <source>Pulling from a remote Mercurial repository</source> <translation>Pull von einem entfernten Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1487"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1493"/> <source>Pushing to a remote Mercurial repository</source> <translation>Push in ein entferntes Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1607"/> <source>Resolving files/directories</source> <translation>Löse Dateien/Verzeichnisse auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Enter branch name</source> <translation>Gib den Zweignamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1634"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <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="1705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <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="1729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1766"/> <source>Showing aliases for remote repositories</source> <translation>Zeige Namen für entfernte Repositories</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1775"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2015"/> <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="1657"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1663"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1927"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> - <source>Apply changegroups</source> - <translation>Änderungsgruppen anwenden</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <source>Apply changegroups</source> + <translation>Änderungsgruppen anwenden</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2040"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2074"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1965"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1979"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837"/> <source>Create .hgignore file</source> <translation>.hgignore Datei erstellen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837"/> <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="2092"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2106"/> <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="1874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1888"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2009"/> <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="1975"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Identifying changegroup file</source> <translation>Identifiziere Änderungsgruppendatei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1891"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <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="2173"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2187"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2168"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> @@ -17747,167 +17746,127 @@ <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="561"/> - <source>Edit repository config</source> - <translation>Repositorykonfiguration editieren</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit repository config...</source> - <translation>Repositorykonfiguration editieren...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> - <source>Show an editor to edit the repository config file</source> - <translation>Zeigt einen Editor zum bearbeiten der Konfigurationsdatei des Repository</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> - <source><b>Edit repository config</b><p>Show an editor to edit the repository config 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="574"/> - <source>Show combined config settings</source> - <translation>Zeige kombinierte Einstellungen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Show combined config settings...</source> - <translation>Zeige kombinierte Einstellungen...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> - <source>Show the combined config settings from all config files</source> - <translation>Zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> - <source><b>Show combined config settings</b><p>This shows the combined config settings from all config 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="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show paths</source> <translation>Pfade anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show paths...</source> <translation>Pfade anzeigen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> <source>Show the aliases for remote repositories</source> <translation>Zeigt die Namen für entfernte Repositories</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> <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 Repositories.</p<</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository</source> <translation>Repository verifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository...</source> <translation>Repository verifizieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <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="606"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> <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="613"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover</source> <translation>Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover...</source> <translation>Transaktion zurücksetzen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> <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="619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <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="819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834"/> <source>Repository Administration</source> <translation>Repository Administration</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source>Create .hgignore</source> <translation>Erstelle .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> <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="645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> <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="652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup...</source> <translation>Änderungsgruppe erzeugen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <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="694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups...</source> <translation>Änderungsgruppen anwenden...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> <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="845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> <source>Changegroup Management</source> <translation>Verwaltung von Änderungsgruppen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <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="700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <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> @@ -17927,152 +17886,152 @@ <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="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"</source> <translation>Als "gut" markieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <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="714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <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="721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"</source> <translation>Als "schlecht" markieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <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="727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <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="734"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source>Skip</source> <translation>Überspringen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Skip the current changeset</source> <translation>Überspringe den aktuellen Änderungssatz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation><b>Überspringen</b><p>Dies überspringt den aktuellen Änderungssatz.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Reset</source> <translation>Zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <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="753"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <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="851"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"...</source> <translation>Als "gut" markieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"...</source> <translation>Als "schlecht" markieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup...</source> <translation>Änderungsgruppe ansehen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify</source> <translation>Identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify...</source> <translation>Identifizieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Identify the project directory</source> <translation>Identifiziere das Projektverzeichnis</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <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="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <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="672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <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="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup</source> <translation>Änderungsgruppe identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup...</source> <translation>Änderungsgruppe identifizieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation>Eine Änderungsgruppendatei für Änderungssätze identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation><b>Änderungsgruppe ansehen</b><p>Dies identifiziert eine Änderungsgruppendatei für Änderungssätze.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Back out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <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="766"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <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> @@ -18092,37 +18051,37 @@ <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="840"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> <source>Specials</source> <translation>Spezialfunktionen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository</source> <translation>Server für Projektrepository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository...</source> <translation>Server für Projektrepository...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> <source>Serve the project repository</source> <translation>Server für das Projektrepository bereitstellen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> <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="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> @@ -18142,25 +18101,85 @@ <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="773"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> <source>Rollback the last transaction</source> <translation>Die letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <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="857"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Extensions</source> <translation>Erweiterungen</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Edit user configuration</source> + <translation>Nutzerkonfiguration editieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Edit user configuration...</source> + <translation>Nutzerkonfiguration editieren...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <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="567"/> + <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="574"/> + <source>Edit repository configuration</source> + <translation>Repositorykonfiguration editieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Edit repository configuration...</source> + <translation>Repositorykonfiguration editieren...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <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="580"/> + <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="587"/> + <source>Show combined configuration settings</source> + <translation>Zeige kombinierte Einstellungen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <source>Show combined configuration settings...</source> + <translation>Zeige kombinierte Einstellungen...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <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="594"/> + <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> </context> <context> <name>HgQueuesDefineGuardsDialog</name> @@ -22614,16 +22633,6 @@ <translation>Log Browser für eingehendes / ausgehendes Log verwenden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> - <source>Edit the mercurial config file</source> - <translation>Editiere die Mercurial config Datei</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> - <source>Edit config file</source> - <translation>Editiere config Datei</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/> <source>Pull</source> <translation>Pull</translation> @@ -22638,6 +22647,16 @@ <source>Update after pulling</source> <translation>Nach Pull aktualisieren</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <source>Edit the Mercurial configuration file</source> + <translation>Editiere die Mercurial Konfigurationsdatei</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> + <source>Edit configuration file</source> + <translation>Konfigurationsdatei editieren</translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -47210,24 +47229,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1078"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1084"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Vorgänger #{0}</b></td><td></td></tr> <tr><td><b>Änderungssatz</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1556"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marken</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1558"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Zweige</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1100"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -47236,7 +47255,7 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1124"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -47253,24 +47272,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1544"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Spitze</b></td><td></td></tr> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1546"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1552"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Änderungssatz</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Vorgänger</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1565"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1571"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -47281,7 +47300,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1554"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation> </message>
--- a/i18n/eric5_en.ts Fri May 27 18:22:07 2011 +0200 +++ b/i18n/eric5_en.ts Fri May 27 19:10:22 2011 +0200 @@ -15023,247 +15023,247 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="205"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="208"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="210"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="257"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="263"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="409"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="415"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="463"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="505"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="511"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="565"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="629"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="728"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="734"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="758"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="764"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="806"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="812"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1025"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1031"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1208"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1386"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1386"/> <source>Select number of entries to show.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1455"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1461"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1487"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1493"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1607"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1634"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1657"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1663"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1766"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1775"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837"/> <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="1913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1927"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1888"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1891"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <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="1965"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1979"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2009"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> - <source>Shall the working directory be updated?</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2015"/> + <source>Shall the working directory be updated?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2040"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2074"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2092"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2106"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2187"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2168"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -17668,352 +17668,312 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit repository config</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit repository config...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> - <source>Show an editor to edit the repository config file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> - <source><b>Edit repository config</b><p>Show an editor to edit the repository config file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Show combined config settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Show combined config settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> - <source>Show the combined config settings from all config files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> - <source><b>Show combined config settings</b><p>This shows the combined config settings from all config files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> <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="600"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> <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="613"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <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="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <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="639"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> <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="652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <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="666"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <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="672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <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="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <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="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <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="721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <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="734"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source>Skip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Skip the current changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Reset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <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="760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="766"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <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="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> - <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="819"/> + <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="834"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -18033,25 +17993,85 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <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="857"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <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="567"/> + <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="574"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <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="580"/> + <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="587"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <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="594"/> + <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> </context> <context> <name>HgQueuesDefineGuardsDialog</name> @@ -22507,12 +22527,12 @@ </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> - <source>Edit the mercurial config file</source> + <source>Edit the Mercurial configuration file</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> - <source>Edit config file</source> + <source>Edit configuration file</source> <translation type="unfinished"></translation> </message> </context> @@ -46817,30 +46837,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1078"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1084"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1556"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1558"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1100"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1124"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -46851,23 +46871,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1544"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1546"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1552"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1565"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1571"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -46875,7 +46895,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1554"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Fri May 27 18:22:07 2011 +0200 +++ b/i18n/eric5_es.ts Fri May 27 19:10:22 2011 +0200 @@ -15164,247 +15164,247 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="205"/> <source>The hg process finished with the exit code {0}</source> <translation>El proceso hg ha terminado con código de salida {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="208"/> <source>The hg process did not finish within 30s.</source> <translation>El proceso hg no terminó en un plazo de 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="210"/> <source>Could not start the hg executable.</source> <translation>No se ha podido iniciar el ejecutable de hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>Create project repository</source> <translation>Crear repositorio del proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>The project repository could not be created.</source> <translation>No se ha podido crear el repositorio del proyecto.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="257"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="263"/> <source>Creating Mercurial repository</source> <translation>Creando repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <source>Initial commit to Mercurial repository</source> <translation>Commit inicial al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonando proyecto desde un repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="409"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="415"/> <source>Commiting changes to Mercurial repository</source> <translation>Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="463"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizando con el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="505"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="511"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Añadiendo archivos/directorios al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="565"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Eliminando archivos/directorios del repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="629"/> <source>Renaming {0}</source> <translation>Renombrando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="806"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="812"/> <source>Merging</source> <translation>Haciendo un merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1208"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1386"/> <source>Mercurial Log</source> <translation>Registro de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1386"/> <source>Select number of entries to show.</source> <translation>Seleccionar número de entradas a mostrar.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1455"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1461"/> <source>Pulling from a remote Mercurial repository</source> <translation>Haciendo pull de un repositorio remoto Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1487"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1493"/> <source>Pushing to a remote Mercurial repository</source> <translation>Haciendo push a un repositorio remoto Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1607"/> <source>Resolving files/directories</source> <translation>Resolviendo archivos/directorios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="728"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="734"/> <source>Taging in the Mercurial repository</source> <translation>Haciendo tag en el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="758"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="764"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1025"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1031"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Create Branch</source> <translation>Crear Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Enter branch name</source> <translation>Introducir nombre de branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1634"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <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="1705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <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="1729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <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="1752"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1766"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1775"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2015"/> <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="1657"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1663"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1927"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> - <source>Apply changegroups</source> - <translation>Aplicar changegroups</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <source>Apply changegroups</source> + <translation>Aplicar changegroups</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2040"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2074"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1965"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1979"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837"/> <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="2092"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2106"/> <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="1874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1888"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2009"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Archivos Changegroup de Mercurial (*.hg);;Todos los Archivos (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Identifying changegroup file</source> <translation>Identificando archivo de changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> <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="1891"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <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="2173"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2187"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2168"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> <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> @@ -17805,165 +17805,165 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> <source>Edit repository config</source> - <translation>Editar configuración del repositorio</translation> + <translation type="obsolete">Editar configuración del repositorio</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> <source>Edit repository config...</source> - <translation>Editar configuración del repositorio...</translation> + <translation type="obsolete">Editar configuración del repositorio...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> <source>Show an editor to edit the repository config file</source> - <translation>Mostrar un editor para editar el archivo de configuración del repositorio</translation> + <translation type="obsolete">Mostrar un editor para editar el archivo de configuración del repositorio</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> <source><b>Edit repository config</b><p>Show an editor to edit the repository config 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> + <translation type="obsolete"><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="574"/> <source>Show combined config settings</source> - <translation>Mostrar ajustes de configuración combinados</translation> + <translation type="obsolete">Mostrar ajustes de configuración combinados</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source>Show combined config settings...</source> - <translation>Mostrar ajustes de configuración combinados...</translation> + <translation type="obsolete">Mostrar ajustes de configuración combinados...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> <source>Show the combined config settings from all config files</source> - <translation>Mostrar los ajustes de configuración combinados con todos los archivos de configuración</translation> + <translation type="obsolete">Mostrar los ajustes de configuración combinados con todos los archivos de configuración</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> <source><b>Show combined config settings</b><p>This shows the combined config settings from all config files.</p></source> - <translation><b>Mostrar ajustes de configuración combinados</b><p>Muestra los ajustes de configuración combinados con todos los archivos de configuración.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <translation type="obsolete"><b>Mostrar ajustes de configuración combinados</b><p>Muestra los ajustes de configuración combinados con todos los archivos de configuración.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show paths</source> <translation>Mostrar rutas</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show paths...</source> <translation>Mostrar rutas...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> <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="593"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> <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="600"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository</source> <translation>Verificar repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository...</source> <translation>Verificar repositorio...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <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="606"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> <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="613"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover</source> <translation>Recuperar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover...</source> <translation>Recuperar...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> <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="619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <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="639"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source>Create .hgignore</source> <translation>Crear .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> <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="645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> <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="819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834"/> <source>Repository Administration</source> <translation>Administración del Repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup...</source> <translation>Crear changegroup...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <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="694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups...</source> <translation>Aplicar changegroups...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> <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="845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> <source>Changegroup Management</source> <translation>Gestión de Chagegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <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="700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <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> @@ -17983,152 +17983,152 @@ <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="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"</source> <translation>Marcar como "bueno"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <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="714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <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="721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"</source> <translation>Marcar como "malo"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <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="727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <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="734"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source>Skip</source> <translation>Saltar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Skip the current changeset</source> <translation>Saltar el changeset actual</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation><b>Saltar</b><p>Salta el changeset actual.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Reset</source> <translation>Reiniciar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <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="753"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <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="851"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"...</source> <translation>Marcar como "bueno"...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"...</source> <translation>Marcar como "malo"...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup...</source> <translation>Previsualizar changegroup...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify</source> <translation>Identificar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify...</source> <translation>Identificar...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Identify the project directory</source> <translation>Identificar el directorio de proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <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="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <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="672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Previsualizar changegroup</b><p>Previsualiza un archivo de changegroup conteniendo una colección de changesets.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup</source> <translation>Identificar changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup...</source> <translation>Identificar changegroup...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation>Identificar un archivo de changegroup conteniendo una colección de changesets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation><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="760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Back out changeset</source> <translation>Hacer respaldo de changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <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="766"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <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> @@ -18148,37 +18148,37 @@ <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="840"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> <source>Specials</source> <translation>Especial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository</source> <translation>Servir repositorio de proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository...</source> <translation>Servir repositorio de proyecto...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> <source>Serve the project repository</source> <translation>Servir el repositorio de proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> <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="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> <source>Pull</source> <translation>Hacer Pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> @@ -18198,25 +18198,85 @@ <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="773"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> <source>Rollback last transaction</source> <translation>Rollback de última transacción</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> <source>Rollback the last transaction</source> <translation>Rollback de la última transacción</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <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="857"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <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="567"/> + <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="574"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <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="580"/> + <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="587"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <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="594"/> + <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> </context> <context> <name>HgQueuesDefineGuardsDialog</name> @@ -22670,12 +22730,12 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> <source>Edit the mercurial config file</source> - <translation>Editar el archivo de configuración de mercurial</translation> + <translation type="obsolete">Editar el archivo de configuración de mercurial</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> <source>Edit config file</source> - <translation>Editar archivo de configuración</translation> + <translation type="obsolete">Editar archivo de configuración</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="124"/> @@ -22707,6 +22767,16 @@ <source>Update after pulling</source> <translation>Hacer update despues de hacer pull</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <source>Edit the Mercurial configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> + <source>Edit configuration file</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -47241,17 +47311,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1556"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiquetas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1558"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1565"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1571"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -47262,31 +47332,31 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1544"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Pista</b></td><td></td></tr> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1546"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1552"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Padres</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1078"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1084"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Padre #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1100"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -47295,7 +47365,7 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1124"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -47312,7 +47382,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1554"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_fr.ts Fri May 27 18:22:07 2011 +0200 +++ b/i18n/eric5_fr.ts Fri May 27 19:10:22 2011 +0200 @@ -16578,247 +16578,247 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="205"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="208"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="210"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="257"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="263"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="409"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="415"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="463"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="505"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="511"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="565"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="629"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="728"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="734"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="758"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="764"/> <source>Reverting changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="806"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="812"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1025"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1031"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1208"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1386"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1386"/> <source>Select number of entries to show.</source> <translation type="unfinished">Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1455"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1461"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1487"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1493"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1607"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1634"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1766"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1775"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2015"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1657"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1663"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1927"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2040"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2074"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1965"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1979"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837"/> <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="2092"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2106"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1888"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2009"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1891"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <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="2173"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2187"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2168"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -19223,167 +19223,127 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit repository config</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit repository config...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> - <source>Show an editor to edit the repository config file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> - <source><b>Edit repository config</b><p>Show an editor to edit the repository config file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Show combined config settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Show combined config settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> - <source>Show the combined config settings from all config files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> - <source><b>Show combined config settings</b><p>This shows the combined config settings from all config files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> <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="600"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> <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="613"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <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="819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834"/> <source>Repository Administration</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>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> <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="652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <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="700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <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> @@ -19403,152 +19363,152 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <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="721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <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="734"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source>Skip</source> <translation type="unfinished">Passer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Skip the current changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Reset</source> <translation type="unfinished">Réinitialiser</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <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="851"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <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="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <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="672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <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="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="766"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> @@ -19568,37 +19528,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> <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="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -19618,25 +19578,85 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <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="857"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <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="567"/> + <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="574"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <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="580"/> + <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="587"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <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="594"/> + <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> </context> <context> <name>HgQueuesDefineGuardsDialog</name> @@ -24308,14 +24328,9 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> - <source>Edit the mercurial config file</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> <source>Edit config file</source> - <translation type="unfinished">Edition du fichier de config</translation> + <translation type="obsolete">Edition du fichier de config</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/> @@ -24332,6 +24347,16 @@ <source>Update after pulling</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <source>Edit the Mercurial configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> + <source>Edit configuration file</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -51899,30 +51924,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1078"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1084"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1556"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1558"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1100"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1124"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -51933,23 +51958,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1544"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1546"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1552"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1565"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1571"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -51957,7 +51982,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1554"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Fri May 27 18:22:07 2011 +0200 +++ b/i18n/eric5_it.ts Fri May 27 19:10:22 2011 +0200 @@ -15106,247 +15106,247 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="205"/> <source>The hg process finished with the exit code {0}</source> <translation>Il processo hg è terminato con codice di uscita {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="208"/> <source>The hg process did not finish within 30s.</source> <translation>Il processo hg non è finito entro i 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="210"/> <source>Could not start the hg executable.</source> <translation>Non posso avviare l'eseguibile hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>Create project repository</source> <translation>Crea il repository del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>The project repository could not be created.</source> <translation>Il repository del progetto non può essere creato.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="257"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="263"/> <source>Creating Mercurial repository</source> <translation>Creazione repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <source>Initial commit to Mercurial repository</source> <translation>Commit iniziale nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonazione del progetto dal repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="409"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="415"/> <source>Commiting changes to Mercurial repository</source> <translation>Commit delle modifiche nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="463"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizzazione con il repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="505"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="511"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Aggiunta di file/directory al repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="565"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Rimozione di file/directory dal repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="629"/> <source>Renaming {0}</source> <translation>Rinomino {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="728"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="734"/> <source>Taging in the Mercurial repository</source> <translation>Creazione tag nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="758"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="764"/> <source>Reverting changes</source> <translation>Annullamento modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="806"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="812"/> <source>Merging</source> <translation>Merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1025"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1031"/> <source>Mercurial command</source> <translation>Comando Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1208"/> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1386"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1386"/> <source>Select number of entries to show.</source> <translation>Mostra il numero di elementi da mostrare.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1455"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1461"/> <source>Pulling from a remote Mercurial repository</source> <translation>Pulling da un repository Mercurial remoto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1487"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1493"/> <source>Pushing to a remote Mercurial repository</source> <translation>Pushing in un repository Mercurial remoto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1607"/> <source>Resolving files/directories</source> <translation>Risoluzione di file/directory</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Create Branch</source> <translation>Creazione Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Enter branch name</source> <translation>Inserisci il nome del Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1634"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <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="1705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <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="1729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <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="1752"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1766"/> <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="1775"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2015"/> <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="1657"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1663"/> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1927"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> - <source>Apply changegroups</source> - <translation>Applica changegroup</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <source>Apply changegroups</source> + <translation>Applica changegroup</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2040"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2074"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1965"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1979"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837"/> <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="2092"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2106"/> <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="1874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1888"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2009"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Changegroup Files (*.hg);;All Files (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Identifying changegroup file</source> <translation>Identifica i file changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1891"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <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="2173"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2187"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2168"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -17746,165 +17746,165 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> <source>Edit repository config</source> - <translation>Modifica configurazione repository</translation> + <translation type="obsolete">Modifica configurazione repository</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> <source>Edit repository config...</source> - <translation>Modifica configurazione repository...</translation> + <translation type="obsolete">Modifica configurazione repository...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> <source>Show an editor to edit the repository config file</source> - <translation>Mostra un editor per modificare il file di configurazione del repository</translation> + <translation type="obsolete">Mostra un editor per modificare il file di configurazione del repository</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> <source><b>Edit repository config</b><p>Show an editor to edit the repository config file.</p></source> - <translation><b>Modifica configurazione repository</b><p>Mostra un editor per modificare il file di configurazione del repository.</p></translation> + <translation type="obsolete"><b>Modifica configurazione repository</b><p>Mostra un editor per modificare il file di configurazione del repository.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source>Show combined config settings</source> - <translation>Mostra configurazioni combinate</translation> + <translation type="obsolete">Mostra configurazioni combinate</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source>Show combined config settings...</source> - <translation>Mostra configurazioni combinate...</translation> + <translation type="obsolete">Mostra configurazioni combinate...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> <source>Show the combined config settings from all config files</source> - <translation>Mostra configurazioni combinate da tutti i file di configurazione</translation> + <translation type="obsolete">Mostra configurazioni combinate da tutti i file di configurazione</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> <source><b>Show combined config settings</b><p>This shows the combined config settings from all config files.</p></source> - <translation><b>Mostra configurazioni combinate</b><p>Mostra configurazioni combinate da tutti i file di configurazione.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <translation type="obsolete"><b>Mostra configurazioni combinate</b><p>Mostra configurazioni combinate da tutti i file di configurazione.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show paths</source> <translation>Mostra percorsi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show paths...</source> <translation>Mostra percorsi...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> <source>Show the aliases for remote repositories</source> <translation>Mostra alias per i repository remoti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Mostra percorsi</b><p>Mostra alias per i repository remoti.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository</source> <translation>Verifica repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository...</source> <translation>Verifica repository...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <source>Verify the integrity of the repository</source> <translation>Verifica l'integrità del repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Verifica repository</b><p>Verifica l'integrità del repository.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover</source> <translation>Recover</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover...</source> <translation>Recover...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> <source>Recover from an interrupted transaction</source> <translation>Recupera da una transazione interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Recover</b><p>Recupera da una transazione interrotta.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834"/> <source>Repository Administration</source> <translation>Amministrazione repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source>Create .hgignore</source> <translation>Crea .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> <source>Create a .hgignore file with default values</source> <translation>Crea una file .hgignore con i valori di default</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation><b>Crea .hgignore</b><p>Crea una file .hgignore con i valori di default.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup...</source> <translation>Crea changegroup...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Create changegroup file collecting changesets</source> <translation>Crea un file changegroup che colleziona i changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups</source> <translation>Applica changegroups</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups...</source> <translation>Applica changegroups...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> <source>Apply one or several changegroup files</source> <translation>Applica una o più file changegroups</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> <source>Changegroup Management</source> <translation>Changegroup Management</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Crea changegroup</b><p>Crea un file changegroup che colleziona i changeset (hg bundle).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Applica changegroups</b><p>Applica una o più file changegroups generati dall'azione Create changegroup' action (hg unbundle).</p></translation> </message> @@ -17924,152 +17924,152 @@ <translation><b>Mostra il branch corrente</b><p>Mostra il branch corrente del progetto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"</source> <translation>Segna come "good"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <source>Mark a selectable changeset as good</source> <translation>Segna un chageset selezionabile come good</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Segna come "good"</b><p>Segna un chageset selezionabile come good.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"</source> <translation>Segna come "bad"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Mark a selectable changeset as bad</source> <translation>Segna un chageset selezionabile come bad</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Segna come bad</b><p>Segna un chageset selezionabile come bad.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="734"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source>Skip</source> <translation>Salta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Skip the current changeset</source> <translation>Salta il changeset corrente</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation><b>Skip</b><p>Salta il changest corrente.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Reset</source> <translation>Resetta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Reset the bisect search data</source> <translation>Reset dei dati di ricerca bisect</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Reset</b><p>Reset dei dati di ricerca bisect.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"...</source> <translation>Segna come "good"...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"...</source> <translation>Segna come "bad"...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup...</source> <translation>Anteprima changegroup...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify</source> <translation>Identify</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify...</source> <translation>Identify...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Identify the project directory</source> <translation>Identifica la directory del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identify</b><p>Identifica la directory del progetto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Anteprima di un file changegroup contenente una collezione di changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Anteprima changegroup</b><p>Anteprima di un file changegroup contenente una collezione di changeset.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup</source> <translation>Identifica changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup...</source> <translation>Identifica changegroup...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation>Identifica un changegroup contenente una collezione di changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation><b>Identifica changegroup</b><p>Identifica un changegroup contenente una collezione di changeset.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Back out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source>Back out changes of an earlier changeset</source> <translation>Ritiro changeset di un changeset precedente</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="766"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation></b>Ritiro changeset</b><p>Ritiro changeset di un changeset precedente.</p></translation> </message> @@ -18089,37 +18089,37 @@ <translation><b>Push modifiche (force)</b><p>Esegue il push delle modifche dal repository locale verso uno remoto usando l'opzione 'force'.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository</source> <translation>Servi repository del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository...</source> <translation>Servi repository del progetto...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> <source>Serve the project repository</source> <translation>Servi il repository del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Servi repository del progetto</b><p>Rende disponibile il repository del progetto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> <source>Specials</source> <translation>Speciali</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> <source>The project should be reread. Do this now?</source> <translation>Il progetto deve essere riletto. Farlo ora ?</translation> </message> @@ -18139,25 +18139,85 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <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="857"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <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="567"/> + <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="574"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <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="580"/> + <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="587"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <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="594"/> + <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> </context> <context> <name>HgQueuesDefineGuardsDialog</name> @@ -22611,12 +22671,12 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> <source>Edit the mercurial config file</source> - <translation>Modifica il file di configurazione di mercurial</translation> + <translation type="obsolete">Modifica il file di configurazione di mercurial</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> <source>Edit config file</source> - <translation>Modifica file di configurazione</translation> + <translation type="obsolete">Modifica file di configurazione</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/> @@ -22633,6 +22693,16 @@ <source>Update after pulling</source> <translation>Aggiorna dopo il pull</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <source>Edit the Mercurial configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> + <source>Edit configuration file</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -47173,24 +47243,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1078"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1084"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Origine #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1556"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tags</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1558"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1100"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -47199,7 +47269,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1124"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -47216,24 +47286,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1544"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1546"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1552"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Origini</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1565"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1571"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -47243,7 +47313,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1554"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_ru.ts Fri May 27 18:22:07 2011 +0200 +++ b/i18n/eric5_ru.ts Fri May 27 19:10:22 2011 +0200 @@ -15213,247 +15213,247 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="205"/> <source>The hg process finished with the exit code {0}</source> <translation>Процесс hg завершился с кодом возврата {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="208"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="210"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>Create project repository</source> <translation>Создать репозиторий проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>The project repository could not be created.</source> <translation>Не могу создать репозиторий проекта.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="257"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="263"/> <source>Creating Mercurial repository</source> <translation>Создание репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <source>Initial commit to Mercurial repository</source> <translation>Первичная подача в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> <source>Cloning project from a Mercurial repository</source> <translation>Создание копии репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="409"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="415"/> <source>Commiting changes to Mercurial repository</source> <translation>Подача изменений в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="463"/> <source>Synchronizing with the Mercurial repository</source> <translation>Синхронизация с репозиторием</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="505"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="511"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Добавление файлов/каталогов в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="565"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Удаление файлов/каталогов из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="629"/> <source>Renaming {0}</source> <translation>Переименование {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="806"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="812"/> <source>Merging</source> <translation>Слияние</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1208"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1386"/> <source>Mercurial Log</source> <translation>лог</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1386"/> <source>Select number of entries to show.</source> <translation>Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1455"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1461"/> <source>Pulling from a remote Mercurial repository</source> <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1487"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1493"/> <source>Pushing to a remote Mercurial repository</source> <translation>Загрузка изменений в удалённый репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1607"/> <source>Resolving files/directories</source> <translation>Разрешение конфликтов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="728"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="734"/> <source>Taging in the Mercurial repository</source> <translation>Создание меток в репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="758"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="764"/> <source>Reverting changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1025"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1031"/> <source>Mercurial command</source> <translation>Mercurial команда</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Create Branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Enter branch name</source> <translation>Введите имя ветви</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1634"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1766"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1775"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2015"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочий каталог?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1657"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1663"/> <source>Showing current branch</source> <translation>Текущая ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1927"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> - <source>Apply changegroups</source> - <translation>Применить группу изменений</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <source>Apply changegroups</source> + <translation>Применить группу изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2040"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная подкоманда ({0}) для Bisect.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2074"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1965"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1979"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> <source>Identifying project directory</source> <translation>Каталог проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже существует. Перезаписать?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2092"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2106"/> <source>Removing files from the Mercurial repository only</source> <translation>Удаление файлов только из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1888"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial файлы изменений (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2009"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Identifying changegroup file</source> <translation>Файлы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1891"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл группы изменений<b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2187"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2168"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -17853,165 +17853,165 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> <source>Edit repository config</source> - <translation>Изменить настройки репозитория</translation> + <translation type="obsolete">Изменить настройки репозитория</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> <source>Edit repository config...</source> - <translation>Изменить настройки репозитория...</translation> + <translation type="obsolete">Изменить настройки репозитория...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> <source>Show an editor to edit the repository config file</source> - <translation>Изменить настройки репозитория</translation> + <translation type="obsolete">Изменить настройки репозитория</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> <source><b>Edit repository config</b><p>Show an editor to edit the repository config file.</p></source> - <translation><b>Изменить настройки репозитория</b><p>Изменить настройки репозитория во встроенном редакторе.</p></translation> + <translation type="obsolete"><b>Изменить настройки репозитория</b><p>Изменить настройки репозитория во встроенном редакторе.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source>Show combined config settings</source> - <translation>Показ комбинированных настроек</translation> + <translation type="obsolete">Показ комбинированных настроек</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> <source>Show combined config settings...</source> - <translation>Показ комбинированных настроек...</translation> + <translation type="obsolete">Показ комбинированных настроек...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> <source>Show the combined config settings from all config files</source> - <translation>Показ комбинированных настроек из всех конфигурационных файлов</translation> + <translation type="obsolete">Показ комбинированных настроек из всех конфигурационных файлов</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> <source><b>Show combined config settings</b><p>This shows the combined config settings from all config files.</p></source> - <translation><b>Показ комбинированных настроек</b><p>Показ комбинированных настроек из всех конфигурационных файлов.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <translation type="obsolete"><b>Показ комбинированных настроек</b><p>Показ комбинированных настроек из всех конфигурационных файлов.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show paths</source> <translation>Показать пути</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show paths...</source> <translation>Показать пути...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> <source>Show the aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Показать пути</b><p>Показать алиасы для удалённых репозиториев.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository</source> <translation>Проверить репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository...</source> <translation>Проверить репозиторий...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <source>Verify the integrity of the repository</source> <translation>Проверить целостность репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Проверить целостность репозитория</b><p>Проверить целостность репозитория.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover</source> <translation>Восстановить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover...</source> <translation>Восстановить...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> <source>Recover from an interrupted transaction</source> <translation>Восстановить после прерванной транзакции</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Восстановить</b><p>Восстановить после прерванной транзакции.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834"/> <source>Repository Administration</source> <translation>Администрирование репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source>Create .hgignore</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> <source>Create a .hgignore file with default values</source> <translation>Создать файл .hgignore со значениями по умолчанию</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation><b>Создать файл .hgignore</b><p>Создать файл .hgignore со значениями по умолчанию.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup...</source> <translation>Создать группу изменений...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Create changegroup file collecting changesets</source> <translation>Создать файл коллекции изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups...</source> <translation>Применить группу изменений...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> <source>Apply one or several changegroup files</source> <translation>Применить файл(ы) группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> <source>Changegroup Management</source> <translation>Менеджмент группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Создать группу изменений</b><p>Создать группу изменений собрав выбранные изменения (hg bundle).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Применить группы изменений</b><p>Применить одну или несколько групп изменений созданную командой 'Создать группу изменений' (hg unbundle).</p></translation> </message> @@ -18031,152 +18031,152 @@ <translation><b>Показать текущую ветвь</b><p>Показать текущую ветвь проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"</source> <translation>Пометить как "хороший"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <source>Mark a selectable changeset as good</source> <translation>Пометить выбранные изменения как "хорошие"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Пометить как "хорошие"</b><p>Пометить выбранные изменения как "хорошие".</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"</source> <translation>Пометить как "плохой"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Mark a selectable changeset as bad</source> <translation>Пометить выбранные изменения как "плохие"</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Пометить как "плохие"</b><p>Пометить выбранные изменения как "плохие".</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="734"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source>Skip</source> <translation>Пропустить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Skip the current changeset</source> <translation>Пропустить текущие изменения</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation><b>Пропустить</b><p>Пропустить текущие изменения.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Reset</source> <translation>Сбросить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Reset the bisect search data</source> <translation>Сбросить данные двоичного поиска</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Сбросить</b><p>Сбросить данные двоичного поиска.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> <source>Bisect</source> <translation>Двоичный поиск</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"...</source> <translation>Пометить как "хороший"...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"...</source> <translation>Пометить как "плохой"...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup...</source> <translation>Предпросмотр группы изменений...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify</source> <translation>Идентифицировать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify...</source> <translation>Идентифицировать...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Identify the project directory</source> <translation>Задайте каталог проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Каталог проекта</b><p>Задайте каталог проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Предпросмотр файла содержащего коллекцию групп изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Предпросмотр групп изменений</b><p>Предпросмотр файла содержащего коллекцию групп изменений.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup</source> <translation>Выбрать группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup...</source> <translation>Выбрать группу изменений...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation>Выбрать файл содержащий коллекцию групп изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation><b>Выбрать изменения</b><p>Выбрать файл содержащий коллекцию групп изменений.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Back out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source>Back out changes of an earlier changeset</source> <translation>Отмена предыдущих изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="766"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Отмена изменений</b><p>Отмена предыдущих изменений.</p></translation> </message> @@ -18196,37 +18196,37 @@ <translation><b>Послать изменения (принудительно)</b><p>Послать изменения в удалённый репозиторий (принудительно).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> <source>Specials</source> <translation>Специфический</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository</source> <translation>Запустить сервер для репозитория проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository...</source> <translation>Запустить сервер для репозитория проекта...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> <source>Serve the project repository</source> <translation>Запустить сервер для репозитория проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Запустить сервер для репозитория проекта</b><p>Запустить сервер для репозитория проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> <source>Pull</source> <translation>Загрузить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> <source>The project should be reread. Do this now?</source> <translation>Необходимо перезагрузить проект. Сделать это?</translation> </message> @@ -18246,25 +18246,85 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <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="857"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <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="567"/> + <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="574"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <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="580"/> + <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="587"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <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="594"/> + <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> </context> <context> <name>HgQueuesDefineGuardsDialog</name> @@ -22715,12 +22775,12 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> <source>Edit the mercurial config file</source> - <translation>Править файл конфигурации Mercurial</translation> + <translation type="obsolete">Править файл конфигурации Mercurial</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> <source>Edit config file</source> - <translation>Править файл конфигурации</translation> + <translation type="obsolete">Править файл конфигурации</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="124"/> @@ -22752,6 +22812,16 @@ <source>Update after pulling</source> <translation>Обновлять рабочий каталог после загрузки</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <source>Edit the Mercurial configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> + <source>Edit configuration file</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -47422,17 +47492,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1556"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Метки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1558"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Ветви</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1565"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1571"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -47443,30 +47513,30 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1544"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1546"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1552"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Изменения</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1078"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1084"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Предок #{0}</b></td><td></td></tr> <tr><td><b>Изменения</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1100"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -47476,7 +47546,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1124"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -47493,7 +47563,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1554"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_tr.ts Fri May 27 18:22:07 2011 +0200 +++ b/i18n/eric5_tr.ts Fri May 27 19:10:22 2011 +0200 @@ -15361,247 +15361,247 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="205"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="208"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="210"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>Create project repository</source> <translation>Bilgi havuzu projesi oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="257"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="263"/> <source>Creating Mercurial repository</source> <translation>Mercurial kaynak havauzu oluşturuluyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="409"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="415"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="463"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="505"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="511"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="565"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="629"/> <source>Renaming {0}</source> <translation>Yenşden adlandırılıyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="728"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="734"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="758"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="764"/> <source>Reverting changes</source> <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="806"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="812"/> <source>Merging</source> <translation>Birleştiriliyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1025"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1031"/> <source>Mercurial command</source> <translation>Mercurial komut</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1208"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1386"/> <source>Mercurial Log</source> <translation>Mercurial Günlüğü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1386"/> <source>Select number of entries to show.</source> <translation>Gösterilecek giriş sayısını seçiniz.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1455"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1461"/> <source>Pulling from a remote Mercurial repository</source> <translation>Uzak Mercurial kaynak havuzundan çekiliyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1487"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1493"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1607"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Create Branch</source> <translation>Sınıf(Branş) Oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Enter branch name</source> <translation>Sınıf(Branş) adını gir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1634"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1657"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1663"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1766"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1775"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p><b>{0}</b> dosyası halihazırda bulunuyor. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1927"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1888"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Değiştirme grubu Dosyaları (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1965"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1979"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2009"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Değişimgrubu Dosyaları (*.hg);;Tüm Dosyalar (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> - <source>Shall the working directory be updated?</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2015"/> + <source>Shall the working directory be updated?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2040"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2074"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2092"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2106"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1891"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <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="2173"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2187"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2168"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -18001,317 +18001,277 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit repository config</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit repository config...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> - <source>Show an editor to edit the repository config file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> - <source><b>Edit repository config</b><p>Show an editor to edit the repository config file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Show combined config settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Show combined config settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> - <source>Show the combined config settings from all config files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> - <source><b>Show combined config settings</b><p>This shows the combined config settings from all config files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> <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="600"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> <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="613"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <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="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <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="639"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> <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="652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <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="666"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <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="672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <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="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <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="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <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="721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <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="734"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source>Skip</source> <translation>Atla</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Skip the current changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Reset</source> <translation>Başadön</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <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="760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="766"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <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="819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -18331,37 +18291,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> <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="840"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> <source>Pull</source> <translation>Çekmek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> <source>The project should be reread. Do this now?</source> <translation>Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> @@ -18381,25 +18341,85 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <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="857"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <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="567"/> + <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="574"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <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="580"/> + <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="587"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <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="594"/> + <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> </context> <context> <name>HgQueuesDefineGuardsDialog</name> @@ -22899,12 +22919,22 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> <source>Edit the mercurial config file</source> - <translation>Mercurial ayar dosyasını düzenle</translation> + <translation type="obsolete">Mercurial ayar dosyasını düzenle</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> <source>Edit config file</source> - <translation>Ayar dosyasını düzenle</translation> + <translation type="obsolete">Ayar dosyasını düzenle</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <source>Edit the Mercurial configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> + <source>Edit configuration file</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -47575,24 +47605,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1078"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1084"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Esas #{0}</b></td><td></td></tr> <tr><td><b>Değişiklik seti</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1556"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiketler</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1558"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branşlar</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1100"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> @@ -47601,7 +47631,7 @@ <tr><td><b>Teslim zamnanı</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1124"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -47618,23 +47648,23 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1544"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>İp ucu</b></td><td></td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1546"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1552"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>DEğişiklik seti</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Esas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1565"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1571"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -47645,7 +47675,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1554"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Fri May 27 18:22:07 2011 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Fri May 27 19:10:22 2011 +0200 @@ -16544,247 +16544,247 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="205"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="208"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="210"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="236"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="257"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="263"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="278"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="409"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="415"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="463"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="505"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="511"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="565"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="629"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="728"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="734"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="758"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="764"/> <source>Reverting changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="806"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="812"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1025"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1031"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1202"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1208"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1386"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1386"/> <source>Select number of entries to show.</source> <translation type="unfinished">选择要显示的条目数。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1455"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1461"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1487"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1493"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1607"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1623"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1629"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1634"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1640"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1705"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1743"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1766"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1775"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2001"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2015"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1657"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1663"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1913"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1927"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2012"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2040"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2060"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2074"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1965"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1979"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1823"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1837"/> <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="2092"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2106"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1888"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2009"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1975"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1989"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2148"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2142"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1891"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1905"/> <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="2173"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2187"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2168"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> @@ -19189,167 +19189,127 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit repository config</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit repository config...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> - <source>Show an editor to edit the repository config file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> - <source><b>Edit repository config</b><p>Show an editor to edit the repository config file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Show combined config settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Show combined config settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> - <source>Show the combined config settings from all config files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> - <source><b>Show combined config settings</b><p>This shows the combined config settings from all config files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show paths</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> <source>Show paths...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="590"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> <source>Show the aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="593"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> <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="600"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="600"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="603"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> <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="613"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="613"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="619"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <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="819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="834"/> <source>Repository Administration</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>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="642"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="645"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> <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="652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="652"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="860"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <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="700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <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> @@ -19369,152 +19329,152 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="714"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> <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="721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <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="734"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source>Skip</source> <translation type="unfinished">跳过</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="737"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Skip the current changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="740"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Reset</source> <translation type="unfinished">重置</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="750"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="753"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <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="851"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="708"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="666"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <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="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <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="672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <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="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="680"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Identify changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="683"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="686"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="760"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="763"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="766"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> @@ -19534,37 +19494,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> <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="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="987"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> @@ -19584,25 +19544,85 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="773"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="776"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="779"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> <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="857"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <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="567"/> + <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="574"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <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="580"/> + <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="587"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <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="594"/> + <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> </context> <context> <name>HgQueuesDefineGuardsDialog</name> @@ -24279,14 +24299,9 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> - <source>Edit the mercurial config file</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> <source>Edit config file</source> - <translation type="unfinished">编辑配置文件</translation> + <translation type="obsolete">编辑配置文件</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/> @@ -24303,6 +24318,16 @@ <source>Update after pulling</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> + <source>Edit the Mercurial configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="165"/> + <source>Edit configuration file</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -51858,30 +51883,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1078"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1084"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1556"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1558"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1564"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1094"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1100"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1118"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1124"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -51892,23 +51917,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1544"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1550"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1546"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1552"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1562"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1565"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1571"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -51916,7 +51941,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1554"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>
