Tue, 20 Apr 2010 19:50:37 +0000
Added an action to create a .hgignore file.
--- a/APIs/Python3/eric5.api Tue Apr 20 19:15:21 2010 +0000 +++ b/APIs/Python3/eric5.api Tue Apr 20 19:50:37 2010 +0000 @@ -2937,6 +2937,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgAnnotate?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBranch?4(name) 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.hgExtendedDiff?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgIncoming?4(name)
--- a/Documentation/Help/source.qhp Tue Apr 20 19:15:21 2010 +0000 +++ b/Documentation/Help/source.qhp Tue Apr 20 19:50:37 2010 +0000 @@ -7786,6 +7786,7 @@ <keyword name="Hg.hgAnnotate" id="Hg.hgAnnotate" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgAnnotate" /> <keyword name="Hg.hgBranch" id="Hg.hgBranch" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBranch" /> <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.hgExtendedDiff" id="Hg.hgExtendedDiff" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgExtendedDiff" /> <keyword name="Hg.hgIncoming" id="Hg.hgIncoming" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgIncoming" /> @@ -7861,6 +7862,7 @@ <keyword name="HgProjectHelper.__hgBranchList" id="HgProjectHelper.__hgBranchList" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBranchList" /> <keyword name="HgProjectHelper.__hgCloseBranch" id="HgProjectHelper.__hgCloseBranch" ref="eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgCloseBranch" /> <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.__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" />
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Tue Apr 20 19:15:21 2010 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Tue Apr 20 19:50:37 2010 +0000 @@ -69,6 +69,9 @@ <td><a href="#HgProjectHelper.__hgConfigure">__hgConfigure</a></td> <td>Private method to open the configuration dialog.</td> </tr><tr> +<td><a href="#HgProjectHelper.__hgCreateIgnore">__hgCreateIgnore</a></td> +<td>Protected slot used to create a .hgignore file for the project.</td> +</tr><tr> <td><a href="#HgProjectHelper.__hgEditRepoConfig">__hgEditRepoConfig</a></td> <td>Protected slot used to edit the repository config file.</td> </tr><tr> @@ -169,6 +172,11 @@ <b>__hgConfigure</b>(<i></i>) <p> Private method to open the configuration dialog. +</p><a NAME="HgProjectHelper.__hgCreateIgnore" ID="HgProjectHelper.__hgCreateIgnore"></a> +<h4>HgProjectHelper.__hgCreateIgnore</h4> +<b>__hgCreateIgnore</b>(<i></i>) +<p> + Protected slot used to create a .hgignore file for the project. </p><a NAME="HgProjectHelper.__hgEditRepoConfig" ID="HgProjectHelper.__hgEditRepoConfig"></a> <h4>HgProjectHelper.__hgEditRepoConfig</h4> <b>__hgEditRepoConfig</b>(<i></i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Tue Apr 20 19:15:21 2010 +0000 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Tue Apr 20 19:50:37 2010 +0000 @@ -87,6 +87,9 @@ <td><a href="#Hg.hgCopy">hgCopy</a></td> <td>Public method used to copy a file/directory.</td> </tr><tr> +<td><a href="#Hg.hgCreateIgnoreFile">hgCreateIgnoreFile</a></td> +<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> </tr><tr> @@ -336,6 +339,24 @@ <dd> flag indicating successfull operation (boolean) </dd> +</dl><a NAME="Hg.hgCreateIgnoreFile" ID="Hg.hgCreateIgnoreFile"></a> +<h4>Hg.hgCreateIgnoreFile</h4> +<b>hgCreateIgnoreFile</b>(<i>name, autoAdd = False</i>) +<p> + Public method to create the ignore file. +</p><dl> +<dt><i>name</i></dt> +<dd> +directory name to create the ignore file in (string) +</dd><dt><i>autoAdd</i></dt> +<dd> +flag indicating to add it automatically (boolean) +</dd> +</dl><dl> +<dt>Returns:</dt> +<dd> +flag indicating success +</dd> </dl><a NAME="Hg.hgEditConfig" ID="Hg.hgEditConfig"></a> <h4>Hg.hgEditConfig</h4> <b>hgEditConfig</b>(<i>name</i>)
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Tue Apr 20 19:15:21 2010 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Tue Apr 20 19:50:37 2010 +0000 @@ -554,6 +554,19 @@ )) self.connect(self.hgRecoverAct, SIGNAL('triggered()'), self.__hgRecover) self.actions.append(self.hgRecoverAct) + + self.hgCreateIgnoreAct = E5Action(self.trUtf8('Create .hgignore'), + self.trUtf8('Create .hgignore'), + 0, 0, self, 'mercurial_create ignore') + self.hgCreateIgnoreAct.setStatusTip(self.trUtf8( + 'Create a .hgignore file with default values' + )) + self.hgCreateIgnoreAct.setWhatsThis(self.trUtf8( + """<b>Create .hgignore</b>""" + """<p>This creates a .hgignore file with default values.</p>""" + )) + self.connect(self.hgCreateIgnoreAct, SIGNAL('triggered()'), self.__hgCreateIgnore) + self.actions.append(self.hgCreateIgnoreAct) def initMenu(self, menu): """ @@ -569,6 +582,8 @@ adminMenu.addAction(self.hgShowConfigAct) adminMenu.addAction(self.hgRepoConfigAct) adminMenu.addSeparator() + adminMenu.addAction(self.hgCreateIgnoreAct) + adminMenu.addSeparator() adminMenu.addAction(self.hgRecoverAct) adminMenu.addSeparator() adminMenu.addAction(self.hgVerifyAct) @@ -760,3 +775,9 @@ Protected slot used to recover from an interrupted transaction. """ self.vcs.hgRecover(self.project.ppath) + + def __hgCreateIgnore(self): + """ + Protected slot used to create a .hgignore file for the project. + """ + self.vcs.hgCreateIgnoreFile(self.project.ppath, autoAdd = True)
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Tue Apr 20 19:15:21 2010 +0000 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Tue Apr 20 19:50:37 2010 +0000 @@ -205,15 +205,6 @@ @return flag indicating an execution without errors (boolean) and a flag indicating the version controll status (boolean) """ - ignorePatterns = [ - "glob:.eric5project", - "glob:.ropeproject", - "glob:.directory", - "glob:**.pyc", - "glob:**.orig", - "glob:**.bak", - ] - msg = vcsDataDict["message"] if not msg: msg = '***' @@ -228,13 +219,7 @@ status = dia.normalExit() if status: - try: - # create a .hgignore file - ignore = open(os.path.join(projectDir, ".hgignore"), "w") - ignore.write("\n".join(ignorePatterns)) - ignore.close() - except IOError: - status = False + status = self.hgCreateIgnoreFile(projectDir) if status: args = [] @@ -1585,6 +1570,41 @@ if res: dia.exec_() + def hgCreateIgnoreFile(self, name, autoAdd = False): + """ + Public method to create the ignore file. + + @param name directory name to create the ignore file in (string) + @param autoAdd flag indicating to add it automatically (boolean) + @return flag indicating success + """ + ignorePatterns = [ + "glob:.eric5project", + "glob:.ropeproject", + "glob:.directory", + "glob:**.pyc", + "glob:**.orig", + "glob:**.bak", + ] + + ignoreName = os.path.join(name, ".hgignore") + try: + # create a .hgignore file + ignore = open(ignoreName, "w") + ignore.write("\n".join(ignorePatterns)) + ignore.write("\n") + ignore.close() + status = True + except IOError: + status = False + + if status and autoAdd: + self.vcsAdd(ignoreName, noDialog = True) + project = e5App().getObject("Project") + project.appendFile(ignoreName) + + return status + ############################################################################ ## Methods to get the helper objects are below. ############################################################################
--- a/i18n/eric5_cs.ts Tue Apr 20 19:15:21 2010 +0000 +++ b/i18n/eric5_cs.ts Tue Apr 20 19:50:37 2010 +0000 @@ -14174,127 +14174,127 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="224"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="215"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="459"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="534"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="592"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="685"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="730"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="715"/> <source>Reverting changes</source> <translation type="unfinished">Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="771"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="756"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1218"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1218"/> <source>Select number of entries to show.</source> <translation type="unfinished">Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1289"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1329"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1438"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1423"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1445"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1445"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1456"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1513"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1498"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1537"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1522"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> @@ -16078,10 +16078,25 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> + <source>Create .hgignore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -16551,12 +16566,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="216"/> <source>active</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="221"/> <source>yes</source> <translation type="unfinished">ano</translation> </message> @@ -43623,30 +43638,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1009"/> <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="1391"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1376"/> <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="1395"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> <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="1036"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <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="1057"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1042"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -43657,23 +43672,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1370"/> <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="1372"/> + <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="1384"/> + <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="1387"/> - <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="1399"/> - <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="1402"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr>
--- a/i18n/eric5_de.ts Tue Apr 20 19:15:21 2010 +0000 +++ b/i18n/eric5_de.ts Tue Apr 20 19:50:37 2010 +0000 @@ -13232,127 +13232,127 @@ <translation>Das Projektrepository konnte nicht erzeugt werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="224"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="215"/> <source>Creating Mercurial repository</source> <translation>Lege Mercurial Repository an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> <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="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> <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="385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> <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="426"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> <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="474"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="459"/> <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="534"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> <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="592"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="685"/> <source>Taging in the Mercurial repository</source> <translation>Marke im Mercurial Repository setzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="730"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="715"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="771"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="756"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Mercurial command</source> <translation>Mercurial Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1218"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1218"/> <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="1304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1289"/> <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="1329"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314"/> <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="1438"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1423"/> <source>Resolving files/directories</source> <translation>Löse Dateien/Verzeichnisse auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1445"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1445"/> <source>Enter branch name</source> <translation>Gib den Zweignamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1456"/> <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="1513"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1498"/> <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="1537"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1522"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/> <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="1583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> @@ -15152,10 +15152,25 @@ <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="566"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> <source>Repository Administration</source> <translation>Repository Administration</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> + <source>Create .hgignore</source> + <translation>Erstelle .hgignore</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <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="564"/> + <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> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -15628,12 +15643,12 @@ <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="216"/> <source>active</source> <translation>aktiv</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="221"/> <source>yes</source> <translation>ja</translation> </message> @@ -40739,24 +40754,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1009"/> <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="1391"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1376"/> <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="1395"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> <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="1036"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <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> @@ -40765,7 +40780,7 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1057"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1042"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -40782,24 +40797,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1370"/> <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="1387"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1372"/> <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="1399"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1384"/> <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="1402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1387"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr>
--- a/i18n/eric5_es.ts Tue Apr 20 19:15:21 2010 +0000 +++ b/i18n/eric5_es.ts Tue Apr 20 19:50:37 2010 +0000 @@ -13256,127 +13256,127 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="224"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="215"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="459"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="534"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="592"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="771"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="756"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> <source>Copying {0}</source> <translation type="unfinished">Copiando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1218"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1218"/> <source>Select number of entries to show.</source> <translation type="unfinished">Seleccionar número de entradas a mostrar.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1289"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1329"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1438"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1423"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="685"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="730"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="715"/> <source>Reverting changes</source> <translation type="unfinished">Revirtiendo cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1445"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1445"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1456"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1513"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1498"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1537"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1522"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> @@ -15170,10 +15170,25 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> + <source>Create .hgignore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -15674,12 +15689,12 @@ <translation type="unfinished">El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="216"/> <source>active</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="221"/> <source>yes</source> <translation type="unfinished">si</translation> </message> @@ -40759,17 +40774,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1391"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1376"/> <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="1395"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> <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="1402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1387"/> <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> @@ -40777,36 +40792,36 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1370"/> <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="1387"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1372"/> <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="1399"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1384"/> <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="1024"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1009"/> <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="1036"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <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="1057"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1042"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_fr.ts Tue Apr 20 19:15:21 2010 +0000 +++ b/i18n/eric5_fr.ts Tue Apr 20 19:50:37 2010 +0000 @@ -14548,127 +14548,127 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="224"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="215"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="459"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="534"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="592"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="685"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="730"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="715"/> <source>Reverting changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="771"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="756"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1218"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1218"/> <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="1304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1289"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1329"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1438"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1423"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1445"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1445"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1456"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1513"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1498"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1537"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1522"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> @@ -16460,10 +16460,25 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> + <source>Create .hgignore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -16934,12 +16949,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="216"/> <source>active</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="221"/> <source>yes</source> <translation type="unfinished">oui</translation> </message> @@ -44879,30 +44894,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1009"/> <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="1391"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1376"/> <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="1395"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> <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="1036"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <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="1057"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1042"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -44913,23 +44928,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1370"/> <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="1372"/> + <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="1384"/> + <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="1387"/> - <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="1399"/> - <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="1402"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr>
--- a/i18n/eric5_it.ts Tue Apr 20 19:15:21 2010 +0000 +++ b/i18n/eric5_it.ts Tue Apr 20 19:50:37 2010 +0000 @@ -14213,127 +14213,127 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="224"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="215"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="459"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="534"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="592"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="685"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="730"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="715"/> <source>Reverting changes</source> <translation type="unfinished">Annullamento modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="771"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="756"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1218"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1218"/> <source>Select number of entries to show.</source> <translation type="unfinished">Mostra il numero di elementi da mostrare.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1289"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1329"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1438"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1423"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1445"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1445"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1456"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1513"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1498"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1537"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1522"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> @@ -16126,10 +16126,25 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> + <source>Create .hgignore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -16600,12 +16615,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="216"/> <source>active</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="221"/> <source>yes</source> <translation type="unfinished">si</translation> </message> @@ -43770,30 +43785,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1009"/> <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="1391"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1376"/> <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="1395"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> <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="1036"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <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="1057"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1042"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -43804,23 +43819,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1370"/> <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="1372"/> + <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="1384"/> + <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="1387"/> - <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="1399"/> - <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="1402"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr>
--- a/i18n/eric5_ru.ts Tue Apr 20 19:15:21 2010 +0000 +++ b/i18n/eric5_ru.ts Tue Apr 20 19:50:37 2010 +0000 @@ -13795,127 +13795,127 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="224"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="215"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="459"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="534"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="592"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="771"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="756"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1218"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1218"/> <source>Select number of entries to show.</source> <translation type="unfinished">Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1289"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1329"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1438"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1423"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="685"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="730"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="715"/> <source>Reverting changes</source> <translation type="unfinished">Отменяю изменения</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1445"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1445"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1456"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1513"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1498"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1537"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1522"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> @@ -15714,10 +15714,25 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> + <source>Create .hgignore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -16218,12 +16233,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="216"/> <source>active</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="221"/> <source>yes</source> <translation type="unfinished">да</translation> </message> @@ -42237,17 +42252,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1391"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1376"/> <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="1395"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> <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="1402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1387"/> <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> @@ -42255,36 +42270,36 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1370"/> <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="1387"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1372"/> <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="1399"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1384"/> <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="1024"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1009"/> <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="1036"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <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="1057"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1042"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
--- a/i18n/eric5_tr.ts Tue Apr 20 19:15:21 2010 +0000 +++ b/i18n/eric5_tr.ts Tue Apr 20 19:50:37 2010 +0000 @@ -14480,127 +14480,127 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="224"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="215"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="459"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="534"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="592"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="685"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="730"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="715"/> <source>Reverting changes</source> <translation type="unfinished">Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="771"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="756"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1218"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1218"/> <source>Select number of entries to show.</source> <translation type="unfinished">gösterilecek giriş miktarını seç.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1289"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1329"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1438"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1423"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1445"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1445"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1456"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1513"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1498"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1537"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1522"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> @@ -16380,10 +16380,25 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> + <source>Create .hgignore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -16853,12 +16868,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="216"/> <source>active</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="221"/> <source>yes</source> <translation type="unfinished">evet</translation> </message> @@ -44005,30 +44020,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1009"/> <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="1391"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1376"/> <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="1395"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> <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="1036"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <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="1057"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1042"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -44039,23 +44054,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1370"/> <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="1372"/> + <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="1384"/> + <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="1387"/> - <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="1399"/> - <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="1402"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr>
--- a/i18n/eric5_zh_CN.GB2312.ts Tue Apr 20 19:15:21 2010 +0000 +++ b/i18n/eric5_zh_CN.GB2312.ts Tue Apr 20 19:50:37 2010 +0000 @@ -14520,127 +14520,127 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="224"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="215"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="426"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="474"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="459"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="534"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="592"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="685"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="730"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="715"/> <source>Reverting changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="771"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="756"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="971"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="956"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1140"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1125"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1218"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1218"/> <source>Select number of entries to show.</source> <translation type="unfinished">选择要显示的条目数。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1289"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1329"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1314"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1438"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1423"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1445"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1445"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1456"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1513"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1498"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1537"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1522"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1560"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1545"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> @@ -16432,10 +16432,25 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="566"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> + <source>Create .hgignore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -16906,12 +16921,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="216"/> <source>active</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="221"/> <source>yes</source> <translation type="unfinished">是</translation> </message> @@ -44850,30 +44865,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1024"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1009"/> <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="1391"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1376"/> <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="1395"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1380"/> <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="1036"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> <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="1057"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1042"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -44884,23 +44899,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1370"/> <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="1372"/> + <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="1384"/> + <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="1387"/> - <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="1399"/> - <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="1402"/> <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>