Mercurial Repositories > eric / changeset
changeset
Added code to ensure, that some eric specific files and directories get ignored
Tue, 29 May 2012 20:59:40 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 29 May 2012 20:59:40 +0200
- changeset 1880
- dbd4d7698310
- parent 1879
- 194a055fff04
- child 1881
- bab54b00f79a
Added code to ensure, that some eric specific files and directories get ignored
--- a/APIs/Python3/eric5.api Mon May 28 15:59:36 2012 +0200 +++ b/APIs/Python3/eric5.api Tue May 29 20:59:40 2012 +0200 @@ -4052,6 +4052,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.transplant.Transplant.hgTransplant?4(path) eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.transplant.Transplant.hgTransplantContinue?4(path) eric5.Plugins.VcsPlugins.vcsMercurial.TransplantExtension.transplant.Transplant?1(vcs) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.IgnoreFileName?7 eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg._createStatusMonitorThread?5(interval, project) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.activeExtensionsChanged?7 eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.clearStatusCache?4() @@ -4115,6 +4116,7 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsGetProjectHelper?4(project) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsImport?4(vcsDataDict, projectDir, noDialog=False) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsInit?4(vcsDir, noDialog=False) +eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsInitConfig?4(project) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsLog?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsMerge?4(name) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsMove?4(name, project, target=None, noDialog=False) @@ -4131,6 +4133,8 @@ eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsUpdate?4(name, noDialog=False, revision=None) eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg?1(plugin, parent=None, name=None) eric5.Plugins.VcsPlugins.vcsPySvn.Config.ConfigSvnProtocols?7 +eric5.Plugins.VcsPlugins.vcsPySvn.Config.DefaultConfig?7 +eric5.Plugins.VcsPlugins.vcsPySvn.Config.DefaultIgnores?7 eric5.Plugins.VcsPlugins.vcsPySvn.ConfigurationPage.SubversionPage.SubversionPage.on_configButton_clicked?4() eric5.Plugins.VcsPlugins.vcsPySvn.ConfigurationPage.SubversionPage.SubversionPage.on_serversButton_clicked?4() eric5.Plugins.VcsPlugins.vcsPySvn.ConfigurationPage.SubversionPage.SubversionPage.save?4() @@ -4274,6 +4278,8 @@ eric5.Plugins.VcsPlugins.vcsPySvn.SvnUrlSelectionDialog.SvnUrlSelectionDialog.on_typeCombo1_currentIndexChanged?4(type_) eric5.Plugins.VcsPlugins.vcsPySvn.SvnUrlSelectionDialog.SvnUrlSelectionDialog.on_typeCombo2_currentIndexChanged?4(type_) eric5.Plugins.VcsPlugins.vcsPySvn.SvnUrlSelectionDialog.SvnUrlSelectionDialog?1(vcs, tagsList, branchesList, path, parent=None) +eric5.Plugins.VcsPlugins.vcsPySvn.SvnUtilities.amendConfig?4() +eric5.Plugins.VcsPlugins.vcsPySvn.SvnUtilities.createDefaultConfig?4() eric5.Plugins.VcsPlugins.vcsPySvn.SvnUtilities.dateFromTime_t?4(seconds) eric5.Plugins.VcsPlugins.vcsPySvn.SvnUtilities.formatTime?4(seconds) eric5.Plugins.VcsPlugins.vcsPySvn.SvnUtilities.getConfigPath?4() @@ -4318,6 +4324,7 @@ eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsGetProjectHelper?4(project) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsImport?4(vcsDataDict, projectDir, noDialog=False) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsInit?4(vcsDir, noDialog=False) +eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsInitConfig?4(project) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsLog?4(name) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsMerge?4(name) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsMove?4(name, project, target=None, noDialog=False) @@ -4335,6 +4342,8 @@ eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion.vcsUpdate?4(name, noDialog=False) eric5.Plugins.VcsPlugins.vcsPySvn.subversion.Subversion?1(plugin, parent=None, name=None) eric5.Plugins.VcsPlugins.vcsSubversion.Config.ConfigSvnProtocols?7 +eric5.Plugins.VcsPlugins.vcsSubversion.Config.DefaultConfig?7 +eric5.Plugins.VcsPlugins.vcsSubversion.Config.DefaultIgnores?7 eric5.Plugins.VcsPlugins.vcsSubversion.ConfigurationPage.SubversionPage.SubversionPage.on_configButton_clicked?4() eric5.Plugins.VcsPlugins.vcsSubversion.ConfigurationPage.SubversionPage.SubversionPage.on_serversButton_clicked?4() eric5.Plugins.VcsPlugins.vcsSubversion.ConfigurationPage.SubversionPage.SubversionPage.save?4() @@ -4498,6 +4507,8 @@ eric5.Plugins.VcsPlugins.vcsSubversion.SvnUrlSelectionDialog.SvnUrlSelectionDialog.on_typeCombo1_currentIndexChanged?4(type_) eric5.Plugins.VcsPlugins.vcsSubversion.SvnUrlSelectionDialog.SvnUrlSelectionDialog.on_typeCombo2_currentIndexChanged?4(type_) eric5.Plugins.VcsPlugins.vcsSubversion.SvnUrlSelectionDialog.SvnUrlSelectionDialog?1(vcs, tagsList, branchesList, path, parent=None) +eric5.Plugins.VcsPlugins.vcsSubversion.SvnUtilities.amendConfig?4() +eric5.Plugins.VcsPlugins.vcsSubversion.SvnUtilities.createDefaultConfig?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnUtilities.getConfigPath?4() eric5.Plugins.VcsPlugins.vcsSubversion.SvnUtilities.getServersPath?4() eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion._createStatusMonitorThread?5(interval, project) @@ -4538,6 +4549,7 @@ eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsGetProjectHelper?4(project) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsImport?4(vcsDataDict, projectDir, noDialog=False) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsInit?4(vcsDir, noDialog=False) +eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsInitConfig?4(project) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsLog?4(name) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsMerge?4(name) eric5.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsMove?4(name, project, target=None, noDialog=False) @@ -7724,6 +7736,7 @@ eric5.VCS.VersionControl.VersionControl.vcsHistory?4(name) eric5.VCS.VersionControl.VersionControl.vcsImport?4(vcsDataDict, projectDir, noDialog=False) eric5.VCS.VersionControl.VersionControl.vcsInit?4(vcsDir, noDialog=False) +eric5.VCS.VersionControl.VersionControl.vcsInitConfig?4(project) eric5.VCS.VersionControl.VersionControl.vcsLog?4(name) eric5.VCS.VersionControl.VersionControl.vcsMerge?4(name) eric5.VCS.VersionControl.VersionControl.vcsMove?4(name, project, target=None, noDialog=False)
--- a/Documentation/Help/source.qhp Mon May 28 15:59:36 2012 +0200 +++ b/Documentation/Help/source.qhp Tue May 29 20:59:40 2012 +0200 @@ -4926,6 +4926,7 @@ <keyword name="Hg.vcsGetProjectHelper" id="Hg.vcsGetProjectHelper" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsGetProjectHelper" /> <keyword name="Hg.vcsImport" id="Hg.vcsImport" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsImport" /> <keyword name="Hg.vcsInit" id="Hg.vcsInit" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsInit" /> + <keyword name="Hg.vcsInitConfig" id="Hg.vcsInitConfig" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsInitConfig" /> <keyword name="Hg.vcsLog" id="Hg.vcsLog" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsLog" /> <keyword name="Hg.vcsMerge" id="Hg.vcsMerge" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsMerge" /> <keyword name="Hg.vcsMove" id="Hg.vcsMove" ref="eric5.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.vcsMove" /> @@ -8940,6 +8941,8 @@ <keyword name="Subversion.vcsImport" id="Subversion.vcsImport" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.vcsImport" /> <keyword name="Subversion.vcsInit" id="Subversion.vcsInit" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.vcsInit" /> <keyword name="Subversion.vcsInit" id="Subversion.vcsInit" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.vcsInit" /> + <keyword name="Subversion.vcsInitConfig" id="Subversion.vcsInitConfig" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.vcsInitConfig" /> + <keyword name="Subversion.vcsInitConfig" id="Subversion.vcsInitConfig" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.vcsInitConfig" /> <keyword name="Subversion.vcsLog" id="Subversion.vcsLog" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.vcsLog" /> <keyword name="Subversion.vcsLog" id="Subversion.vcsLog" ref="eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion.vcsLog" /> <keyword name="Subversion.vcsMerge" id="Subversion.vcsMerge" ref="eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.vcsMerge" /> @@ -10846,6 +10849,7 @@ <keyword name="VersionControl.vcsHistory" id="VersionControl.vcsHistory" ref="eric5.VCS.VersionControl.html#VersionControl.vcsHistory" /> <keyword name="VersionControl.vcsImport" id="VersionControl.vcsImport" ref="eric5.VCS.VersionControl.html#VersionControl.vcsImport" /> <keyword name="VersionControl.vcsInit" id="VersionControl.vcsInit" ref="eric5.VCS.VersionControl.html#VersionControl.vcsInit" /> + <keyword name="VersionControl.vcsInitConfig" id="VersionControl.vcsInitConfig" ref="eric5.VCS.VersionControl.html#VersionControl.vcsInitConfig" /> <keyword name="VersionControl.vcsLog" id="VersionControl.vcsLog" ref="eric5.VCS.VersionControl.html#VersionControl.vcsLog" /> <keyword name="VersionControl.vcsMerge" id="VersionControl.vcsMerge" ref="eric5.VCS.VersionControl.html#VersionControl.vcsMerge" /> <keyword name="VersionControl.vcsMove" id="VersionControl.vcsMove" ref="eric5.VCS.VersionControl.html#VersionControl.vcsMove" /> @@ -11336,6 +11340,8 @@ <keyword name="_percentReplacementFunc" id="_percentReplacementFunc" ref="eric5.Utilities.__init__.html#_percentReplacementFunc" /> <keyword name="addActions" id="addActions" ref="eric5.E5Gui.E5Action.html#addActions" /> <keyword name="addSearchPath" id="addSearchPath" ref="eric5.UI.PixmapCache.html#addSearchPath" /> + <keyword name="amendConfig" id="amendConfig" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnUtilities.html#amendConfig" /> + <keyword name="amendConfig" id="amendConfig" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnUtilities.html#amendConfig" /> <keyword name="analyze" id="analyze" ref="eric5.DataViews.CodeMetrics.html#analyze" /> <keyword name="append_PKCS7_padding" id="append_PKCS7_padding" ref="eric5.Utilities.crypto.py3AES.html#append_PKCS7_padding" /> <keyword name="binplistlib (Module)" id="binplistlib (Module)" ref="eric5.Utilities.binplistlib.html" /> @@ -11428,6 +11434,8 @@ <keyword name="createConfigurationPage" id="createConfigurationPage" ref="eric5.Plugins.PluginVcsMercurial.html#createConfigurationPage" /> <keyword name="createConfigurationPage" id="createConfigurationPage" ref="eric5.Plugins.PluginVcsPySvn.html#createConfigurationPage" /> <keyword name="createConfigurationPage" id="createConfigurationPage" ref="eric5.Plugins.PluginVcsSubversion.html#createConfigurationPage" /> + <keyword name="createDefaultConfig" id="createDefaultConfig" ref="eric5.Plugins.VcsPlugins.vcsPySvn.SvnUtilities.html#createDefaultConfig" /> + <keyword name="createDefaultConfig" id="createDefaultConfig" ref="eric5.Plugins.VcsPlugins.vcsSubversion.SvnUtilities.html#createDefaultConfig" /> <keyword name="createGlobalPluginsDir" id="createGlobalPluginsDir" ref="eric5.install.html#createGlobalPluginsDir" /> <keyword name="createInstallConfig" id="createInstallConfig" ref="eric5.install.html#createInstallConfig" /> <keyword name="createMacAppBundle" id="createMacAppBundle" ref="eric5.install.html#createMacAppBundle" />
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Mon May 28 15:59:36 2012 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html Tue May 29 20:59:40 2012 +0200 @@ -59,7 +59,7 @@ VersionControl <h3>Class Attributes</h3> <table> -<tr><td>None</td></tr> +<tr><td>IgnoreFileName</td></tr> </table> <h3>Class Methods</h3> <table> @@ -269,6 +269,9 @@ <td><a href="#Hg.vcsInit">vcsInit</a></td> <td>Public method used to initialize the mercurial repository.</td> </tr><tr> +<td><a href="#Hg.vcsInitConfig">vcsInitConfig</a></td> +<td>Public method to initialize the VCS configuration.</td> +</tr><tr> <td><a href="#Hg.vcsLog">vcsLog</a></td> <td>Public method used to view the log of a file/directory from the Mercurial repository.</td> </tr><tr> @@ -1203,6 +1206,18 @@ <dd> always TRUE </dd> +</dl><a NAME="Hg.vcsInitConfig" ID="Hg.vcsInitConfig"></a> +<h4>Hg.vcsInitConfig</h4> +<b>vcsInitConfig</b>(<i>project</i>) +<p> + Public method to initialize the VCS configuration. +</p><p> + This method ensures, that an ignore file exists. +</p><dl> +<dt><i>project</i></dt> +<dd> +reference to the project (Project) +</dd> </dl><a NAME="Hg.vcsLog" ID="Hg.vcsLog"></a> <h4>Hg.vcsLog</h4> <b>vcsLog</b>(<i>name</i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.Config.html Mon May 28 15:59:36 2012 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.Config.html Tue May 29 20:59:40 2012 +0200 @@ -26,7 +26,7 @@ </p> <h3>Global Attributes</h3> <table> -<tr><td>ConfigSvnProtocols</td></tr> +<tr><td>ConfigSvnProtocols</td></tr><tr><td>DefaultConfig</td></tr><tr><td>DefaultIgnores</td></tr> </table> <h3>Classes</h3> <table>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnUtilities.html Mon May 28 15:59:36 2012 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnUtilities.html Tue May 29 20:59:40 2012 +0200 @@ -35,6 +35,12 @@ <h3>Functions</h3> <table> <tr> +<td><a href="#amendConfig">amendConfig</a></td> +<td>Module function to amend the config file.</td> +</tr><tr> +<td><a href="#createDefaultConfig">createDefaultConfig</a></td> +<td>Module function to create a default config file suitable for eric.</td> +</tr><tr> <td><a href="#dateFromTime_t">dateFromTime_t</a></td> <td>Module function to return the date.</td> </tr><tr> @@ -42,13 +48,29 @@ <td>Module function to return a formatted time string.</td> </tr><tr> <td><a href="#getConfigPath">getConfigPath</a></td> -<td>Public method to get the filename of the config file.</td> +<td>Module function to get the filename of the config file.</td> </tr><tr> <td><a href="#getServersPath">getServersPath</a></td> -<td>Public method to get the filename of the servers file.</td> +<td>Module function to get the filename of the servers file.</td> </tr> </table> <hr /><hr /> +<a NAME="amendConfig" ID="amendConfig"></a> +<h2>amendConfig</h2> +<b>amendConfig</b>(<i></i>) +<p> + Module function to amend the config file. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="createDefaultConfig" ID="createDefaultConfig"></a> +<h2>createDefaultConfig</h2> +<b>createDefaultConfig</b>(<i></i>) +<p> + Module function to create a default config file suitable for eric. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="dateFromTime_t" ID="dateFromTime_t"></a> <h2>dateFromTime_t</h2> <b>dateFromTime_t</b>(<i>seconds</i>) @@ -89,7 +111,7 @@ <h2>getConfigPath</h2> <b>getConfigPath</b>(<i></i>) <p> - Public method to get the filename of the config file. + Module function to get the filename of the config file. </p><dl> <dt>Returns:</dt> <dd> @@ -102,7 +124,7 @@ <h2>getServersPath</h2> <b>getServersPath</b>(<i></i>) <p> - Public method to get the filename of the servers file. + Module function to get the filename of the servers file. </p><dl> <dt>Returns:</dt> <dd>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html Mon May 28 15:59:36 2012 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.subversion.html Tue May 29 20:59:40 2012 +0200 @@ -202,6 +202,9 @@ <td><a href="#Subversion.vcsInit">vcsInit</a></td> <td>Public method used to initialize the subversion repository.</td> </tr><tr> +<td><a href="#Subversion.vcsInitConfig">vcsInitConfig</a></td> +<td>Public method to initialize the VCS configuration.</td> +</tr><tr> <td><a href="#Subversion.vcsLog">vcsLog</a></td> <td>Public method used to view the log of a file/directory from the Subversion repository.</td> </tr><tr> @@ -943,6 +946,18 @@ <dd> always TRUE </dd> +</dl><a NAME="Subversion.vcsInitConfig" ID="Subversion.vcsInitConfig"></a> +<h4>Subversion.vcsInitConfig</h4> +<b>vcsInitConfig</b>(<i>project</i>) +<p> + Public method to initialize the VCS configuration. +</p><p> + This method ensures, that eric specific files and directories are ignored. +</p><dl> +<dt><i>project</i></dt> +<dd> +reference to the project (Project) +</dd> </dl><a NAME="Subversion.vcsLog" ID="Subversion.vcsLog"></a> <h4>Subversion.vcsLog</h4> <b>vcsLog</b>(<i>name</i>)
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.Config.html Mon May 28 15:59:36 2012 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.Config.html Tue May 29 20:59:40 2012 +0200 @@ -26,7 +26,7 @@ </p> <h3>Global Attributes</h3> <table> -<tr><td>ConfigSvnProtocols</td></tr> +<tr><td>ConfigSvnProtocols</td></tr><tr><td>DefaultConfig</td></tr><tr><td>DefaultIgnores</td></tr> </table> <h3>Classes</h3> <table>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnUtilities.html Mon May 28 15:59:36 2012 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.SvnUtilities.html Tue May 29 20:59:40 2012 +0200 @@ -35,19 +35,41 @@ <h3>Functions</h3> <table> <tr> +<td><a href="#amendConfig">amendConfig</a></td> +<td>Module function to amend the config file.</td> +</tr><tr> +<td><a href="#createDefaultConfig">createDefaultConfig</a></td> +<td>Module function to create a default config file suitable for eric.</td> +</tr><tr> <td><a href="#getConfigPath">getConfigPath</a></td> -<td>Public method to get the filename of the config file.</td> +<td>Module function to get the filename of the config file.</td> </tr><tr> <td><a href="#getServersPath">getServersPath</a></td> -<td>Public method to get the filename of the servers file.</td> +<td>Module function to get the filename of the servers file.</td> </tr> </table> <hr /><hr /> +<a NAME="amendConfig" ID="amendConfig"></a> +<h2>amendConfig</h2> +<b>amendConfig</b>(<i></i>) +<p> + Module function to amend the config file. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="createDefaultConfig" ID="createDefaultConfig"></a> +<h2>createDefaultConfig</h2> +<b>createDefaultConfig</b>(<i></i>) +<p> + Module function to create a default config file suitable for eric. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="getConfigPath" ID="getConfigPath"></a> <h2>getConfigPath</h2> <b>getConfigPath</b>(<i></i>) <p> - Public method to get the filename of the config file. + Module function to get the filename of the config file. </p><dl> <dt>Returns:</dt> <dd> @@ -60,7 +82,7 @@ <h2>getServersPath</h2> <b>getServersPath</b>(<i></i>) <p> - Public method to get the filename of the servers file. + Module function to get the filename of the servers file. </p><dl> <dt>Returns:</dt> <dd>
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html Mon May 28 15:59:36 2012 +0200 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsSubversion.subversion.html Tue May 29 20:59:40 2012 +0200 @@ -196,6 +196,9 @@ <td><a href="#Subversion.vcsInit">vcsInit</a></td> <td>Public method used to initialize the subversion repository.</td> </tr><tr> +<td><a href="#Subversion.vcsInitConfig">vcsInitConfig</a></td> +<td>Public method to initialize the VCS configuration.</td> +</tr><tr> <td><a href="#Subversion.vcsLog">vcsLog</a></td> <td>Public method used to view the log of a file/directory from the Subversion repository.</td> </tr><tr> @@ -914,6 +917,18 @@ <dd> always TRUE </dd> +</dl><a NAME="Subversion.vcsInitConfig" ID="Subversion.vcsInitConfig"></a> +<h4>Subversion.vcsInitConfig</h4> +<b>vcsInitConfig</b>(<i>project</i>) +<p> + Public method to initialize the VCS configuration. +</p><p> + This method ensures, that an ignore file exists. +</p><dl> +<dt><i>project</i></dt> +<dd> +reference to the project (Project) +</dd> </dl><a NAME="Subversion.vcsLog" ID="Subversion.vcsLog"></a> <h4>Subversion.vcsLog</h4> <b>vcsLog</b>(<i>name</i>)
--- a/Documentation/Source/eric5.VCS.VersionControl.html Mon May 28 15:59:36 2012 +0200 +++ b/Documentation/Source/eric5.VCS.VersionControl.html Tue May 29 20:59:40 2012 +0200 @@ -184,6 +184,9 @@ <td><a href="#VersionControl.vcsInit">vcsInit</a></td> <td>Public method used to initialize the vcs.</td> </tr><tr> +<td><a href="#VersionControl.vcsInitConfig">vcsInitConfig</a></td> +<td>Public method to initialize the VCS configuration.</td> +</tr><tr> <td><a href="#VersionControl.vcsLog">vcsLog</a></td> <td>Public method used to view the log of a file/directory in the vcs.</td> </tr><tr> @@ -832,6 +835,19 @@ <dd> not implemented </dd> +</dl><a NAME="VersionControl.vcsInitConfig" ID="VersionControl.vcsInitConfig"></a> +<h4>VersionControl.vcsInitConfig</h4> +<b>vcsInitConfig</b>(<i>project</i>) +<p> + Public method to initialize the VCS configuration. +</p><p> + This method could ensure, that certain files or directories are + exclude from being version controlled. +</p><dl> +<dt><i>project</i></dt> +<dd> +reference to the project (Project) +</dd> </dl><a NAME="VersionControl.vcsLog" ID="VersionControl.vcsLog"></a> <h4>VersionControl.vcsLog</h4> <b>vcsLog</b>(<i>name</i>)
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Mon May 28 15:59:36 2012 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Tue May 29 20:59:40 2012 +0200 @@ -241,8 +241,7 @@ act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), self.trUtf8('Revert changes'), self.__HgRevert) self.vcsMenuActions.append(act) - # TODO: rename to "Conflict resolved (and subsequent occurrances)" - act = menu.addAction(self.trUtf8('Resolve conflict'), self.__HgResolve) + act = menu.addAction(self.trUtf8('Conflict resolved'), self.__HgResolve) self.vcsMenuActions.append(act) menu.addSeparator() menu.addAction(self.trUtf8('Select all local file entries'), @@ -312,7 +311,7 @@ act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), self.trUtf8('Revert changes'), self.__HgRevert) self.vcsMultiMenuActions.append(act) - act = menu.addAction(self.trUtf8('Resolve conflict'), self.__HgResolve) + act = menu.addAction(self.trUtf8('Conflict resolved'), self.__HgResolve) self.vcsMultiMenuActions.append(act) menu.addSeparator() menu.addAction(self.trUtf8('Select all local file entries'), @@ -423,7 +422,7 @@ act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), self.trUtf8('Revert changes'), self.__HgRevert) self.vcsDirMenuActions.append(act) - act = menu.addAction(self.trUtf8('Resolve conflict'), self.__HgResolve) + act = menu.addAction(self.trUtf8('Conflict resolved'), self.__HgResolve) self.vcsDirMenuActions.append(act) menu.addSeparator() menu.addAction(self.trUtf8('Select all local file entries'), @@ -491,7 +490,7 @@ act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), self.trUtf8('Revert changes'), self.__HgRevert) self.vcsDirMultiMenuActions.append(act) - act = menu.addAction(self.trUtf8('Resolve conflict'), self.__HgResolve) + act = menu.addAction(self.trUtf8('Conflict resolved'), self.__HgResolve) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() menu.addAction(self.trUtf8('Select all local file entries'),
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Mon May 28 15:59:36 2012 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Tue May 29 20:59:40 2012 +0200 @@ -219,20 +219,6 @@ self.vcsExportAct.triggered[()].connect(self._vcsExport) self.actions.append(self.vcsExportAct) - # TODO: remove this action from the menu - self.vcsAddAct = E5Action(self.trUtf8('Add to repository'), - UI.PixmapCache.getIcon("vcsAdd.png"), - self.trUtf8('&Add to repository...'), 0, 0, self, 'mercurial_add') - self.vcsAddAct.setStatusTip(self.trUtf8( - 'Add the local project to the repository' - )) - self.vcsAddAct.setWhatsThis(self.trUtf8( - """<b>Add to repository</b>""" - """<p>This adds (imports) the local project to the repository.</p>""" - )) - self.vcsAddAct.triggered[()].connect(self._vcsImport) - self.actions.append(self.vcsAddAct) - self.vcsRemoveAct = E5Action(self.trUtf8('Remove from repository (and disk)'), UI.PixmapCache.getIcon("vcsRemove.png"), self.trUtf8('&Remove from repository (and disk)'), @@ -387,16 +373,15 @@ self.vcsMergeAct.triggered[()].connect(self._vcsMerge) self.actions.append(self.vcsMergeAct) - # TODO: rename to "Conflicts resolved" - self.vcsResolveAct = E5Action(self.trUtf8('Resolve conflicts'), - self.trUtf8('Resolve con&flicts'), + self.vcsResolveAct = E5Action(self.trUtf8('Conflicts resolved'), + self.trUtf8('Con&flicts resolved'), 0, 0, self, 'mercurial_resolve') self.vcsResolveAct.setStatusTip(self.trUtf8( - 'Resolve all conflicts of the local project' + 'Mark all conflicts of the local project as resolved' )) self.vcsResolveAct.setWhatsThis(self.trUtf8( - """<b>Resolve conflicts</b>""" - """<p>This resolves all conflicts of the local project.</p>""" + """<b>Conflicts resolved</b>""" + """<p>This marks all conflicts of the local project as resolved.</p>""" )) self.vcsResolveAct.triggered[()].connect(self.__hgResolve) self.actions.append(self.vcsResolveAct) @@ -1004,7 +989,6 @@ menu.addAction(self.vcsNewAct) menu.addAction(self.vcsExportAct) menu.addSeparator() - menu.addAction(self.vcsAddAct) menu.addAction(self.vcsRemoveAct) menu.addSeparator() menu.addAction(self.vcsTagAct)
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Mon May 28 15:59:36 2012 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Tue May 29 20:59:40 2012 +0200 @@ -78,6 +78,8 @@ committed = pyqtSignal() activeExtensionsChanged = pyqtSignal() + IgnoreFileName = ".hgignore" + def __init__(self, plugin, parent=None, name=None): """ Constructor @@ -1114,6 +1116,18 @@ """ return "Mercurial" + def vcsInitConfig(self, project): + """ + Public method to initialize the VCS configuration. + + This method ensures, that an ignore file exists. + + @param project reference to the project (Project) + """ + ignoreName = os.path.join(project.getProjectPath(), Hg.IgnoreFileName) + if not os.path.exists(ignoreName): + self.hgCreateIgnoreFile(project.getProjectPath(), autoAdd=True) + def vcsCleanup(self, name): """ Public method used to cleanup the working directory. @@ -1990,6 +2004,8 @@ ignorePatterns = [ "glob:.eric5project", "glob:_eric5project", + "glob:.eric4project", + "glob:_eric4project", "glob:.ropeproject", "glob:_ropeproject", "glob:.directory", @@ -1999,10 +2015,13 @@ "glob:**.bak", "glob:**.rej", "glob:**~", + "glob:cur", + "glob:tmp", "glob:__pycache__", + "glob:**.DS_Store", ] - ignoreName = os.path.join(name, ".hgignore") + ignoreName = os.path.join(name, Hg.IgnoreFileName) if os.path.exists(ignoreName): res = E5MessageBox.yesNo(self.__ui, self.trUtf8("Create .hgignore file"),
--- a/Plugins/VcsPlugins/vcsPySvn/Config.py Mon May 28 15:59:36 2012 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/Config.py Tue May 29 20:59:40 2012 +0200 @@ -7,7 +7,10 @@ Module defining configuration variables for the subversion package """ -# Available protocols fpr the repository URL +import os + + +# Available protocols for the repository URL ConfigSvnProtocols = [ 'file://', 'http://', @@ -15,3 +18,174 @@ 'svn://', 'svn+ssh://', ] + + +DefaultConfig = os.linesep.join([ + "### This file configures various client-side behaviors.", + "###", + "### The commented-out examples below are intended to demonstrate", + "### how to use this file.", + "", + "### Section for authentication and authorization customizations.", + "[auth]", + "### Set password stores used by Subversion. They should be", + "### delimited by spaces or commas. The order of values determines", + "### the order in which password stores are used.", + "### Valid password stores:", + "### gnome-keyring (Unix-like systems)", + "### kwallet (Unix-like systems)", + "### keychain (Mac OS X)", + "### windows-cryptoapi (Windows)", + "# password-stores = keychain", + "# password-stores = windows-cryptoapi", + "# password-stores = gnome-keyring,kwallet", + "### To disable all password stores, use an empty list:", + "# password-stores =", + "###", + "### Set KWallet wallet used by Subversion. If empty or unset,", + "### then the default network wallet will be used.", + "# kwallet-wallet =", + "###", + "### Include PID (Process ID) in Subversion application name when", + "### using KWallet. It defaults to 'no'.", + "# kwallet-svn-application-name-with-pid = yes", + "###", + "### The rest of the [auth] section in this file has been deprecated.", + "### Both 'store-passwords' and 'store-auth-creds' can now be", + "### specified in the 'servers' file in your config directory", + "### and are documented there. Anything specified in this section ", + "### is overridden by settings specified in the 'servers' file.", + "# store-passwords = no", + "# store-auth-creds = no", + "", + "### Section for configuring external helper applications.", + "[helpers]", + "### Set editor-cmd to the command used to invoke your text editor.", + "### This will override the environment variables that Subversion", + "### examines by default to find this information ($EDITOR, ", + "### et al).", + "# editor-cmd = editor (vi, emacs, notepad, etc.)", + "### Set diff-cmd to the absolute path of your 'diff' program.", + "### This will override the compile-time default, which is to use", + "### Subversion's internal diff implementation.", + "# diff-cmd = diff_program (diff, gdiff, etc.)", + "### Diff-extensions are arguments passed to an external diff", + "### program or to Subversion's internal diff implementation.", + "### Set diff-extensions to override the default arguments ('-u').", + "# diff-extensions = -u -p", + "### Set diff3-cmd to the absolute path of your 'diff3' program.", + "### This will override the compile-time default, which is to use", + "### Subversion's internal diff3 implementation.", + "# diff3-cmd = diff3_program (diff3, gdiff3, etc.)", + "### Set diff3-has-program-arg to 'yes' if your 'diff3' program", + "### accepts the '--diff-program' option.", + "# diff3-has-program-arg = [yes | no]", + "### Set merge-tool-cmd to the command used to invoke your external", + "### merging tool of choice. Subversion will pass 5 arguments to", + "### the specified command: base theirs mine merged wcfile", + "# merge-tool-cmd = merge_command", + "", + "### Section for configuring tunnel agents.", + "[tunnels]", + "### Configure svn protocol tunnel schemes here. By default, only", + "### the 'ssh' scheme is defined. You can define other schemes to", + "### be used with 'svn+scheme://hostname/path' URLs. A scheme", + "### definition is simply a command, optionally prefixed by an", + "### environment variable name which can override the command if it", + "### is defined. The command (or environment variable) may contain", + "### arguments, using standard shell quoting for arguments with", + "### spaces. The command will be invoked as:", + "### <command> <hostname> svnserve -t", + "### (If the URL includes a username, then the hostname will be", + "### passed to the tunnel agent as <user>@<hostname>.) If the", + "### built-in ssh scheme were not predefined, it could be defined", + "### as:", + "# ssh = $SVN_SSH ssh -q", + "### If you wanted to define a new 'rsh' scheme, to be used with", + "### 'svn+rsh:' URLs, you could do so as follows:", + "# rsh = rsh", + "### Or, if you wanted to specify a full path and arguments:", + "# rsh = /path/to/rsh -l myusername", + "### On Windows, if you are specifying a full path to a command,", + "### use a forward slash (/) or a paired backslash (\\\\) as the", + "### path separator. A single backslash will be treated as an", + "### escape for the following character.", + "", + "### Section for configuring miscelleneous Subversion options.", + "[miscellany]", + "### Set global-ignores to a set of whitespace-delimited globs", + "### which Subversion will ignore in its 'status' output, and", + "### while importing or adding files and directories.", + "### '*' matches leading dots, e.g. '*.rej' matches '.foo.rej'.", + "global-ignores = *.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc", + " *.pyo .*.rej *.rej .*~ *~ #*# .#* .*.swp .DS_Store", + " *.orig *.bak cur tmp __pycache__ .directory", + " .ropeproject .eric4project .eric5project", + " _ropeproject _eric4project _eric5project", + "### Set log-encoding to the default encoding for log messages", + "# log-encoding = latin1", + "### Set use-commit-times to make checkout/update/switch/revert", + "### put last-committed timestamps on every file touched.", + "# use-commit-times = yes", + "### Set no-unlock to prevent 'svn commit' from automatically", + "### releasing locks on files.", + "# no-unlock = yes", + "### Set mime-types-file to a MIME type registry file, used to", + "### provide hints to Subversion's MIME type auto-detection", + "### algorithm.", + "# mime-types-file = /path/to/mime.types", + "### Set preserved-conflict-file-exts to a whitespace-delimited", + "### list of patterns matching file extensions which should be", + "### preserved in generated conflict file names. By default,", + "### conflict files use custom extensions.", + "# preserved-conflict-file-exts = doc ppt xls od?", + "### Set enable-auto-props to 'yes' to enable automatic properties", + "### for 'svn add' and 'svn import', it defaults to 'no'.", + "### Automatic properties are defined in the section 'auto-props'.", + "# enable-auto-props = yes", + "### Set interactive-conflicts to 'no' to disable interactive", + "### conflict resolution prompting. It defaults to 'yes'.", + "# interactive-conflicts = no", + "### Set memory-cache-size to define the size of the memory cache", + "### used by the client when accessing a FSFS repository via", + "### ra_local (the file:// scheme). The value represents the number", + "### of MB used by the cache.", + "# memory-cache-size = 16", + "", + "### Section for configuring automatic properties.", + "[auto-props]", + "### The format of the entries is:", + "### file-name-pattern = propname[=value][;propname[=value]...]", + "### The file-name-pattern can contain wildcards (such as '*' and", + "### '?'). All entries which match (case-insensitively) will be", + "### applied to the file. Note that auto-props functionality", + "### must be enabled, which is typically done by setting the", + "### 'enable-auto-props' option.", + "# *.c = svn:eol-style=native", + "# *.cpp = svn:eol-style=native", + "# *.h = svn:keywords=Author Date Id Rev URL;svn:eol-style=native", + "# *.dsp = svn:eol-style=CRLF", + "# *.dsw = svn:eol-style=CRLF", + "# *.sh = svn:eol-style=native;svn:executable", + "# *.txt = svn:eol-style=native;svn:keywords=Author Date Id Rev URL;", + "# *.png = svn:mime-type=image/png", + "# *.jpg = svn:mime-type=image/jpeg", + "# Makefile = svn:eol-style=native", + "", +]) + + +DefaultIgnores = [ + "*.orig", + "*.bak", + "cur", + "tmp", + "__pycache__", + ".directory", + ".ropeproject", + ".eric4project", + ".eric5project", + "_ropeproject", + "_eric4project", + "_eric5project", +]
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Mon May 28 15:59:36 2012 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Tue May 29 20:59:40 2012 +0200 @@ -275,8 +275,7 @@ act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), self.trUtf8('Merge changes'), self._VCSMerge) self.vcsMenuActions.append(act) - # TODO: rename to "Conflict resolved (and subsequent occurrances)" - act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) + act = menu.addAction(self.trUtf8('Conflict resolved'), self.__SVNResolve) self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), @@ -383,7 +382,7 @@ act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), self.trUtf8('Revert changes'), self._VCSRevert) self.vcsMultiMenuActions.append(act) - act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) + act = menu.addAction(self.trUtf8('Conflict resolved'), self.__SVNResolve) self.vcsMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction(UI.PixmapCache.getIcon("vcsLock.png"), @@ -537,7 +536,7 @@ act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), self.trUtf8('Merge changes'), self._VCSMerge) self.vcsDirMenuActions.append(act) - act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) + act = menu.addAction(self.trUtf8('Conflict resolved'), self.__SVNResolve) self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction(self.trUtf8('Set Property'), self.__SVNSetProp) @@ -631,7 +630,7 @@ act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), self.trUtf8('Merge changes'), self._VCSMerge) self.vcsDirMultiMenuActions.append(act) - act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) + act = menu.addAction(self.trUtf8('Conflict resolved'), self.__SVNResolve) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction(self.trUtf8('Set Property'), self.__SVNSetProp)
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Mon May 28 15:59:36 2012 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Tue May 29 20:59:40 2012 +0200 @@ -86,20 +86,6 @@ self.vcsCommitAct.triggered[()].connect(self._vcsCommit) self.actions.append(self.vcsCommitAct) - # TODO: remove this action from the menu - self.vcsAddAct = E5Action(self.trUtf8('Add to repository'), - UI.PixmapCache.getIcon("vcsAdd.png"), - self.trUtf8('&Add to repository...'), 0, 0, self, 'subversion_add') - self.vcsAddAct.setStatusTip(self.trUtf8( - 'Add the local project to the VCS repository' - )) - self.vcsAddAct.setWhatsThis(self.trUtf8( - """<b>Add to repository</b>""" - """<p>This adds (imports) the local project to the VCS repository.</p>""" - )) - self.vcsAddAct.triggered[()].connect(self._vcsImport) - self.actions.append(self.vcsAddAct) - self.vcsRemoveAct = E5Action(self.trUtf8('Remove from repository (and disk)'), UI.PixmapCache.getIcon("vcsRemove.png"), self.trUtf8('&Remove from repository (and disk)'), @@ -298,16 +284,15 @@ self.vcsSwitchAct.triggered[()].connect(self._vcsSwitch) self.actions.append(self.vcsSwitchAct) - # TODO: rename to "Conflicts resolved" - self.vcsResolveAct = E5Action(self.trUtf8('Resolve conflicts'), - self.trUtf8('Resolve con&flicts'), + self.vcsResolveAct = E5Action(self.trUtf8('Conflicts resolved'), + self.trUtf8('Con&flicts resolved'), 0, 0, self, 'subversion_resolve') self.vcsResolveAct.setStatusTip(self.trUtf8( - 'Resolve all conflicts of the local project' + 'Mark all conflicts of the local project as resolved' )) self.vcsResolveAct.setWhatsThis(self.trUtf8( - """<b>Resolve conflicts</b>""" - """<p>This resolves all conflicts of the local project.</p>""" + """<b>Conflicts resolved</b>""" + """<p>This marks all conflicts of the local project as resolved.</p>""" )) self.vcsResolveAct.triggered[()].connect(self.__svnResolve) self.actions.append(self.vcsResolveAct) @@ -480,7 +465,6 @@ menu.addAction(self.vcsNewAct) menu.addAction(self.vcsExportAct) menu.addSeparator() - menu.addAction(self.vcsAddAct) menu.addAction(self.vcsRemoveAct) menu.addSeparator() menu.addAction(self.vcsTagAct)
--- a/Plugins/VcsPlugins/vcsPySvn/SvnUtilities.py Mon May 28 15:59:36 2012 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnUtilities.py Tue May 29 20:59:40 2012 +0200 @@ -13,6 +13,8 @@ import Utilities +from .Config import DefaultConfig, DefaultIgnores + def formatTime(seconds): """ @@ -38,7 +40,7 @@ def getServersPath(): """ - Public method to get the filename of the servers file. + Module function to get the filename of the servers file. @return filename of the servers file (string) """ @@ -52,7 +54,7 @@ def getConfigPath(): """ - Public method to get the filename of the config file. + Module function to get the filename of the config file. @return filename of the config file (string) """ @@ -62,3 +64,71 @@ else: homedir = Utilities.getHomeDir() return os.path.join(homedir, ".subversion", "config") + + +def createDefaultConfig(): + """ + Module function to create a default config file suitable for eric. + """ + config = getConfigPath() + try: + os.makedirs(os.path.dirname(config)) + except OSError: + pass + try: + f = open(config, "w") + f.write(DefaultConfig) + f.close() + except IOError: + pass + + +def amendConfig(): + """ + Module function to amend the config file. + """ + config = getConfigPath() + try: + f = open(config, "r") + configList = f.read().splitlines() + f.close() + except IOError: + return + + newConfig = [] + ignoresFound = False + amendList = [] + for line in configList: + if line.find("global-ignores") in [0, 2]: + ignoresFound = True + if line.startswith("# "): + line = line[2:] + newConfig.append(line) + for amend in DefaultIgnores: + if amend not in line: + amendList.append(amend) + elif ignoresFound: + if line.startswith("##"): + ignoresFound = False + if amendList: + newConfig.append(" " + " ".join(amendList)) + newConfig.append(line) + continue + elif line.startswith("# "): + line = line[2:] + newConfig.append(line) + oldAmends = amendList[:] + amendList = [] + for amend in oldAmends: + if amend not in line: + amendList.append(amend) + else: + newConfig.append(line) + + if newConfig != configList: + try: + f = open(config, "w") + f.write(os.linesep.join(newConfig)) + f.close() + except IOError: + pass
--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py Mon May 28 15:59:36 2012 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py Tue May 29 20:59:40 2012 +0200 @@ -48,6 +48,7 @@ from .SvnUrlSelectionDialog import SvnUrlSelectionDialog from .SvnRepoBrowserDialog import SvnRepoBrowserDialog from .SvnStatusMonitorThread import SvnStatusMonitorThread +from .SvnUtilities import getConfigPath, amendConfig, createDefaultConfig from .ProjectBrowserHelper import SvnProjectBrowserHelper @@ -1493,6 +1494,20 @@ """ self.statusCache = {} + def vcsInitConfig(self, project): + """ + Public method to initialize the VCS configuration. + + This method ensures, that eric specific files and directories are ignored. + + @param project reference to the project (Project) + """ + configPath = getConfigPath() + if os.path.exists(configPath): + amendConfig() + else: + createDefaultConfig() + def vcsName(self): """ Public method returning the name of the vcs.
--- a/Plugins/VcsPlugins/vcsSubversion/Config.py Mon May 28 15:59:36 2012 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/Config.py Tue May 29 20:59:40 2012 +0200 @@ -7,7 +7,10 @@ Module defining configuration variables for the subversion package """ -# Available protocols fpr the repository URL +import os + + +# Available protocols for the repository URL ConfigSvnProtocols = [ 'file://', 'http://', @@ -15,3 +18,174 @@ 'svn://', 'svn+ssh://', ] + + +DefaultConfig = os.linesep.join([ + "### This file configures various client-side behaviors.", + "###", + "### The commented-out examples below are intended to demonstrate", + "### how to use this file.", + "", + "### Section for authentication and authorization customizations.", + "[auth]", + "### Set password stores used by Subversion. They should be", + "### delimited by spaces or commas. The order of values determines", + "### the order in which password stores are used.", + "### Valid password stores:", + "### gnome-keyring (Unix-like systems)", + "### kwallet (Unix-like systems)", + "### keychain (Mac OS X)", + "### windows-cryptoapi (Windows)", + "# password-stores = keychain", + "# password-stores = windows-cryptoapi", + "# password-stores = gnome-keyring,kwallet", + "### To disable all password stores, use an empty list:", + "# password-stores =", + "###", + "### Set KWallet wallet used by Subversion. If empty or unset,", + "### then the default network wallet will be used.", + "# kwallet-wallet =", + "###", + "### Include PID (Process ID) in Subversion application name when", + "### using KWallet. It defaults to 'no'.", + "# kwallet-svn-application-name-with-pid = yes", + "###", + "### The rest of the [auth] section in this file has been deprecated.", + "### Both 'store-passwords' and 'store-auth-creds' can now be", + "### specified in the 'servers' file in your config directory", + "### and are documented there. Anything specified in this section ", + "### is overridden by settings specified in the 'servers' file.", + "# store-passwords = no", + "# store-auth-creds = no", + "", + "### Section for configuring external helper applications.", + "[helpers]", + "### Set editor-cmd to the command used to invoke your text editor.", + "### This will override the environment variables that Subversion", + "### examines by default to find this information ($EDITOR, ", + "### et al).", + "# editor-cmd = editor (vi, emacs, notepad, etc.)", + "### Set diff-cmd to the absolute path of your 'diff' program.", + "### This will override the compile-time default, which is to use", + "### Subversion's internal diff implementation.", + "# diff-cmd = diff_program (diff, gdiff, etc.)", + "### Diff-extensions are arguments passed to an external diff", + "### program or to Subversion's internal diff implementation.", + "### Set diff-extensions to override the default arguments ('-u').", + "# diff-extensions = -u -p", + "### Set diff3-cmd to the absolute path of your 'diff3' program.", + "### This will override the compile-time default, which is to use", + "### Subversion's internal diff3 implementation.", + "# diff3-cmd = diff3_program (diff3, gdiff3, etc.)", + "### Set diff3-has-program-arg to 'yes' if your 'diff3' program", + "### accepts the '--diff-program' option.", + "# diff3-has-program-arg = [yes | no]", + "### Set merge-tool-cmd to the command used to invoke your external", + "### merging tool of choice. Subversion will pass 5 arguments to", + "### the specified command: base theirs mine merged wcfile", + "# merge-tool-cmd = merge_command", + "", + "### Section for configuring tunnel agents.", + "[tunnels]", + "### Configure svn protocol tunnel schemes here. By default, only", + "### the 'ssh' scheme is defined. You can define other schemes to", + "### be used with 'svn+scheme://hostname/path' URLs. A scheme", + "### definition is simply a command, optionally prefixed by an", + "### environment variable name which can override the command if it", + "### is defined. The command (or environment variable) may contain", + "### arguments, using standard shell quoting for arguments with", + "### spaces. The command will be invoked as:", + "### <command> <hostname> svnserve -t", + "### (If the URL includes a username, then the hostname will be", + "### passed to the tunnel agent as <user>@<hostname>.) If the", + "### built-in ssh scheme were not predefined, it could be defined", + "### as:", + "# ssh = $SVN_SSH ssh -q", + "### If you wanted to define a new 'rsh' scheme, to be used with", + "### 'svn+rsh:' URLs, you could do so as follows:", + "# rsh = rsh", + "### Or, if you wanted to specify a full path and arguments:", + "# rsh = /path/to/rsh -l myusername", + "### On Windows, if you are specifying a full path to a command,", + "### use a forward slash (/) or a paired backslash (\\\\) as the", + "### path separator. A single backslash will be treated as an", + "### escape for the following character.", + "", + "### Section for configuring miscelleneous Subversion options.", + "[miscellany]", + "### Set global-ignores to a set of whitespace-delimited globs", + "### which Subversion will ignore in its 'status' output, and", + "### while importing or adding files and directories.", + "### '*' matches leading dots, e.g. '*.rej' matches '.foo.rej'.", + "global-ignores = *.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc", + " *.pyo .*.rej *.rej .*~ *~ #*# .#* .*.swp .DS_Store", + " *.orig *.bak cur tmp __pycache__ .directory", + " .ropeproject .eric4project .eric5project", + " _ropeproject _eric4project _eric5project", + "### Set log-encoding to the default encoding for log messages", + "# log-encoding = latin1", + "### Set use-commit-times to make checkout/update/switch/revert", + "### put last-committed timestamps on every file touched.", + "# use-commit-times = yes", + "### Set no-unlock to prevent 'svn commit' from automatically", + "### releasing locks on files.", + "# no-unlock = yes", + "### Set mime-types-file to a MIME type registry file, used to", + "### provide hints to Subversion's MIME type auto-detection", + "### algorithm.", + "# mime-types-file = /path/to/mime.types", + "### Set preserved-conflict-file-exts to a whitespace-delimited", + "### list of patterns matching file extensions which should be", + "### preserved in generated conflict file names. By default,", + "### conflict files use custom extensions.", + "# preserved-conflict-file-exts = doc ppt xls od?", + "### Set enable-auto-props to 'yes' to enable automatic properties", + "### for 'svn add' and 'svn import', it defaults to 'no'.", + "### Automatic properties are defined in the section 'auto-props'.", + "# enable-auto-props = yes", + "### Set interactive-conflicts to 'no' to disable interactive", + "### conflict resolution prompting. It defaults to 'yes'.", + "# interactive-conflicts = no", + "### Set memory-cache-size to define the size of the memory cache", + "### used by the client when accessing a FSFS repository via", + "### ra_local (the file:// scheme). The value represents the number", + "### of MB used by the cache.", + "# memory-cache-size = 16", + "", + "### Section for configuring automatic properties.", + "[auto-props]", + "### The format of the entries is:", + "### file-name-pattern = propname[=value][;propname[=value]...]", + "### The file-name-pattern can contain wildcards (such as '*' and", + "### '?'). All entries which match (case-insensitively) will be", + "### applied to the file. Note that auto-props functionality", + "### must be enabled, which is typically done by setting the", + "### 'enable-auto-props' option.", + "# *.c = svn:eol-style=native", + "# *.cpp = svn:eol-style=native", + "# *.h = svn:keywords=Author Date Id Rev URL;svn:eol-style=native", + "# *.dsp = svn:eol-style=CRLF", + "# *.dsw = svn:eol-style=CRLF", + "# *.sh = svn:eol-style=native;svn:executable", + "# *.txt = svn:eol-style=native;svn:keywords=Author Date Id Rev URL;", + "# *.png = svn:mime-type=image/png", + "# *.jpg = svn:mime-type=image/jpeg", + "# Makefile = svn:eol-style=native", + "", +]) + + +DefaultIgnores = [ + "*.orig", + "*.bak", + "cur", + "tmp", + "__pycache__", + ".directory", + ".ropeproject", + ".eric4project", + ".eric5project", + "_ropeproject", + "_eric4project", + "_eric5project", +]
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Mon May 28 15:59:36 2012 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Tue May 29 20:59:40 2012 +0200 @@ -270,8 +270,7 @@ act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), self.trUtf8('Merge changes'), self._VCSMerge) self.vcsMenuActions.append(act) - # TODO: rename to "Conflict resolved (and subsequent occurrances)" - act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) + act = menu.addAction(self.trUtf8('Conflict resolved'), self.__SVNResolve) self.vcsMenuActions.append(act) if self.vcs.version >= (1, 2, 0): menu.addSeparator() @@ -379,7 +378,7 @@ act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"), self.trUtf8('Revert changes'), self._VCSRevert) self.vcsMultiMenuActions.append(act) - act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) + act = menu.addAction(self.trUtf8('Conflict resolved'), self.__SVNResolve) self.vcsMultiMenuActions.append(act) if self.vcs.version >= (1, 2, 0): menu.addSeparator() @@ -531,7 +530,7 @@ act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), self.trUtf8('Merge changes'), self._VCSMerge) self.vcsDirMenuActions.append(act) - act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) + act = menu.addAction(self.trUtf8('Conflict resolved'), self.__SVNResolve) self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction(self.trUtf8('Set Property'), self.__SVNSetProp) @@ -625,7 +624,7 @@ act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"), self.trUtf8('Merge changes'), self._VCSMerge) self.vcsDirMultiMenuActions.append(act) - act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve) + act = menu.addAction(self.trUtf8('Conflict resolved'), self.__SVNResolve) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction(self.trUtf8('Set Property'), self.__SVNSetProp)
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Mon May 28 15:59:36 2012 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Tue May 29 20:59:40 2012 +0200 @@ -86,20 +86,6 @@ self.vcsCommitAct.triggered[()].connect(self._vcsCommit) self.actions.append(self.vcsCommitAct) - # TODO: remove this action from the menu - self.vcsAddAct = E5Action(self.trUtf8('Add to repository'), - UI.PixmapCache.getIcon("vcsAdd.png"), - self.trUtf8('&Add to repository...'), 0, 0, self, 'subversion_add') - self.vcsAddAct.setStatusTip(self.trUtf8( - 'Add the local project to the VCS repository' - )) - self.vcsAddAct.setWhatsThis(self.trUtf8( - """<b>Add to repository</b>""" - """<p>This adds (imports) the local project to the VCS repository.</p>""" - )) - self.vcsAddAct.triggered[()].connect(self._vcsImport) - self.actions.append(self.vcsAddAct) - self.vcsRemoveAct = E5Action(self.trUtf8('Remove from repository (and disk)'), UI.PixmapCache.getIcon("vcsRemove.png"), self.trUtf8('&Remove from repository (and disk)'), @@ -283,16 +269,15 @@ self.vcsSwitchAct.triggered[()].connect(self._vcsSwitch) self.actions.append(self.vcsSwitchAct) - # TODO: rename to "Conflicts resolved" - self.vcsResolveAct = E5Action(self.trUtf8('Resolve conflicts'), - self.trUtf8('Resolve con&flicts'), + self.vcsResolveAct = E5Action(self.trUtf8('Conflicts resolved'), + self.trUtf8('Con&flicts resolved'), 0, 0, self, 'subversion_resolve') self.vcsResolveAct.setStatusTip(self.trUtf8( - 'Resolve all conflicts of the local project' + 'Mark all conflicts of the local project as resolved' )) self.vcsResolveAct.setWhatsThis(self.trUtf8( - """<b>Resolve conflicts</b>""" - """<p>This resolves all conflicts of the local project.</p>""" + """<b>Conflicts resolved</b>""" + """<p>This marks all conflicts of the local project as resolved.</p>""" )) self.vcsResolveAct.triggered[()].connect(self.__svnResolve) self.actions.append(self.vcsResolveAct) @@ -465,7 +450,6 @@ menu.addAction(self.vcsNewAct) menu.addAction(self.vcsExportAct) menu.addSeparator() - menu.addAction(self.vcsAddAct) menu.addAction(self.vcsRemoveAct) menu.addSeparator() menu.addAction(self.vcsTagAct)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnUtilities.py Mon May 28 15:59:36 2012 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnUtilities.py Tue May 29 20:59:40 2012 +0200 @@ -11,10 +11,12 @@ import Utilities +from .Config import DefaultConfig, DefaultIgnores + def getServersPath(): """ - Public method to get the filename of the servers file. + Module function to get the filename of the servers file. @return filename of the servers file (string) """ @@ -28,7 +30,7 @@ def getConfigPath(): """ - Public method to get the filename of the config file. + Module function to get the filename of the config file. @return filename of the config file (string) """ @@ -38,3 +40,71 @@ else: homedir = Utilities.getHomeDir() return os.path.join(homedir, ".subversion", "config") + + +def createDefaultConfig(): + """ + Module function to create a default config file suitable for eric. + """ + config = getConfigPath() + try: + os.makedirs(os.path.dirname(config)) + except OSError: + pass + try: + f = open(config, "w") + f.write(DefaultConfig) + f.close() + except IOError: + pass + + +def amendConfig(): + """ + Module function to amend the config file. + """ + config = getConfigPath() + try: + f = open(config, "r") + configList = f.read().splitlines() + f.close() + except IOError: + return + + newConfig = [] + ignoresFound = False + amendList = [] + for line in configList: + if line.find("global-ignores") in [0, 2]: + ignoresFound = True + if line.startswith("# "): + line = line[2:] + newConfig.append(line) + for amend in DefaultIgnores: + if amend not in line: + amendList.append(amend) + elif ignoresFound: + if line.startswith("##"): + ignoresFound = False + if amendList: + newConfig.append(" " + " ".join(amendList)) + newConfig.append(line) + continue + elif line.startswith("# "): + line = line[2:] + newConfig.append(line) + oldAmends = amendList[:] + amendList = [] + for amend in oldAmends: + if amend not in line: + amendList.append(amend) + else: + newConfig.append(line) + + if newConfig != configList: + try: + f = open(config, "w") + f.write(os.linesep.join(newConfig)) + f.close() + except IOError: + pass
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py Mon May 28 15:59:36 2012 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py Tue May 29 20:59:40 2012 +0200 @@ -44,6 +44,7 @@ from .SvnUrlSelectionDialog import SvnUrlSelectionDialog from .SvnRepoBrowserDialog import SvnRepoBrowserDialog from .SvnStatusMonitorThread import SvnStatusMonitorThread +from .SvnUtilities import getConfigPath, amendConfig, createDefaultConfig from .ProjectBrowserHelper import SvnProjectBrowserHelper @@ -1323,6 +1324,20 @@ """ self.statusCache = {} + def vcsInitConfig(self, project): + """ + Public method to initialize the VCS configuration. + + This method ensures, that an ignore file exists. + + @param project reference to the project (Project) + """ + configPath = getConfigPath() + if os.path.exists(configPath): + amendConfig() + else: + createDefaultConfig() + def vcsName(self): """ Public method returning the name of the vcs.
--- a/Project/Project.py Mon May 28 15:59:36 2012 +0200 +++ b/Project/Project.py Tue May 29 20:59:40 2012 +0200 @@ -1946,7 +1946,6 @@ self.vcs = self.initVCS() self.setDirty(True) if self.vcs is not None: - # TODO: ensure a minimal VCS configuration (mgmt dir excluded) # edit VCS command options vcores = E5MessageBox.yesNo(self.ui, self.trUtf8("New Project"), @@ -2004,7 +2003,6 @@ self.vcs = self.initVCS() self.setDirty(True) if self.vcs is not None: - # TODO: ensure a minimal VCS configuration (mgmt dir excluded) # edit VCS command options vcores = E5MessageBox.yesNo(self.ui, self.trUtf8("New Project"), @@ -3738,6 +3736,8 @@ if forProject: self.pdata["VCS"][0] = 'None' self.setDirty(True) + else: + vcs.vcsInitConfig(self) if vcs and forProject: # set the vcs options
--- a/VCS/VersionControl.py Mon May 28 15:59:36 2012 +0200 +++ b/VCS/VersionControl.py Tue May 29 20:59:40 2012 +0200 @@ -435,6 +435,17 @@ """ pass + def vcsInitConfig(self, project): + """ + Public method to initialize the VCS configuration. + + This method could ensure, that certain files or directories are + exclude from being version controlled. + + @param project reference to the project (Project) + """ + pass + def vcsDefaultOptions(self): """ Public method used to retrieve the default options for the vcs.
--- a/changelog Mon May 28 15:59:36 2012 +0200 +++ b/changelog Tue May 29 20:59:40 2012 +0200 @@ -12,6 +12,9 @@ - Terminal -- added the capability to search in the output of the terminal window - Version Control System Interfaces + -- All + --- added code to ensure, that some eric specific files and directories + get ignored -- Mercurial --- added support for amending commits as of Mercurial 2.2 - Web Browser
--- a/i18n/eric5_cs.ts Mon May 28 15:59:36 2012 +0200 +++ b/i18n/eric5_cs.ts Tue May 29 20:59:40 2012 +0200 @@ -16962,42 +16962,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/> <source>The hg process finished with the exit code {0}</source> <translation>hg proces skončil s exit kódem {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="252"/> - <source>The hg process did not finish within 30s.</source> - <translation>hg proces neskončil do 30s.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="254"/> + <source>The hg process did not finish within 30s.</source> + <translation>hg proces neskončil do 30s.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="256"/> <source>Could not start the hg executable.</source> <translation>Nelze spustit hg program.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> <source>Create project repository</source> <translation>Vytvořit repozitář projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> <source>The project repository could not be created.</source> <translation>Úložiště projektu nelze vytvořit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="310"/> <source>Creating Mercurial repository</source> <translation>Vytváření Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="325"/> <source>Initial commit to Mercurial repository</source> <translation>Úvodní zápis změn (commit) do Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="369"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="371"/> <source>Cloning project from a Mercurial repository</source> <translation>Naklonovat projekt z Mercurial úložiště</translation> </message> @@ -17007,47 +17007,47 @@ <translation type="obsolete">Zapsání změn (commit) do Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="533"/> <source>Synchronizing with the Mercurial repository</source> <translation>Synchronizovat s Mercurial úložištěm</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="585"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Přidat soubory/složky do Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="647"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="649"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Odebrat soubory/složky z Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/> <source>Renaming {0}</source> <translation>Přejmenování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="840"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="842"/> <source>Taging in the Mercurial repository</source> <translation>Otagovat Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="873"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="875"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="925"/> <source>Merging</source> <translation>Merging</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1176"/> <source>Mercurial command</source> <translation>Mercurial příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1352"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> @@ -17062,112 +17062,112 @@ <translation type="obsolete">Vyberte počet položek, které se mají zobrazit.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1597"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1611"/> <source>Pulling from a remote Mercurial repository</source> <translation>Stažení (pull) z Mercurial repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1650"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> <source>Pushing to a remote Mercurial repository</source> <translation>Odeslání (push) do Mercurial repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Resolving files/directories</source> <translation>Vyřešení souborů/složek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> <source>Create Branch</source> <translation>Vytvořit větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> <source>Enter branch name</source> <translation>Zadejte název větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> <source>Creating branch in the Mercurial repository</source> <translation>Vytvoření větve v Mercurial repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1882"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Ověřit integritu Mercurial repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Showing the combined configuration settings</source> <translation>Zobrazení nastavení kombinovaných konfigurací</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Showing aliases for remote repositories</source> <translation>Zobrazení aliasů pro vzdálené úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>Recovering from interrupted transaction</source> <translation>Obnovení z přerušené transakce</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> <source>Shall the working directory be updated?</source> <translation>Má být pracovní adresář aktualizován?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1839"/> <source>Showing current branch</source> <translation>Zobrazení aktuální větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <source>Create changegroup</source> <translation>Vytvořit skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> <source>Apply changegroups</source> <translation>Použít skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Neplatný bisect podpříkaz ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1976"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> <source>Identifying project directory</source> <translation>Rozpoznat složku projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Create .hgignore file</source> <translation>Vytvořit soubor .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Soubor <b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2305"/> <source>Removing files from the Mercurial repository only</source> <translation>Odebrat soubory jen z Mercurial úložiště</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Soubory Mercurial skupiny změn (*.hg)</translation> </message> @@ -17177,82 +17177,82 @@ <translation type="obsolete"><p>Soubor Mercurial skupiny změn<b>{0}</b> již existuje.</p><p>Má se přepsat?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2185"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Soubory Mercurial skupiny změn (*.hg);;Všechny soubory (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <source>Identifying changegroup file</source> <translation>Rozpoznat soubor skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> <source>Backing out changeset</source> <translation>Zálohovat skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> <source>No revision given. Aborting...</source> <translation>Nebyla dána žádná revize. Ruším...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2367"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2381"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="479"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="481"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -19835,7 +19835,7 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> <source>Resolve conflict</source> - <translation>Vyřešit konflikty</translation> + <translation type="obsolete">Vyřešit konflikty</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> @@ -19872,6 +19872,11 @@ <source>Do you really want to remove these files from the repository?</source> <translation>Opravdu chcete odebrat tyto soubory z repozitáře?</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> + <source>Conflict resolved</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -20018,60 +20023,60 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Add to repository</source> - <translation>Přidat do repozitáře</translation> + <translation type="obsolete">Přidat do repozitáře</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>&Add to repository...</source> - <translation>Přid&at do repozitáře...</translation> + <translation type="obsolete">Přid&at do repozitáře...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="225"/> <source>Add the local project to the repository</source> - <translation>Přidat lokální projekt do repozitáře</translation> + <translation type="obsolete">Přidat lokální projekt do repozitáře</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228"/> <source><b>Add to repository</b><p>This adds (imports) the local project to the repository.</p></source> - <translation><b>Přidat do repozitáře</b><p>Přidá (importuje) lokální projekt do repozitáře.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <translation type="obsolete"><b>Přidat do repozitáře</b><p>Přidá (importuje) lokální projekt do repozitáře.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Remove from repository (and disk)</source> <translation>Odebrat z repozitáře (a z disku)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>&Remove from repository (and disk)</source> <translation>Odeb&rat z repozitáře (a z disku)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="239"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> <source>Remove the local project from the repository (and disk)</source> <translation>Odebrat lokální projekt z repozitáře (a z disku)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> <source><b>Remove from repository</b><p>This removes the local project from the repository (and disk).</p></source> <translation><b>Odebrat z repozitáře</b><p>Lokální projekt se odebere z repozitáře (a z disku).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Show log</source> <translation>Zobrazit log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Show &log</source> <translation>Zobrazit &log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241"/> <source>Show the log of the local project</source> <translation>Zobrazit log lokálního projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="257"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="244"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Zobrazit log</b><p>Zobrazí log lokálního projektu.</p></translation> </message> @@ -20091,372 +20096,372 @@ <translation type="obsolete"><b>Zobrazit limitovaný log</b><p>Zobrazuje log lokálního projektu jen do určitého počtu záznamů.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>Show log browser</source> <translation>Zobrazit log prohlížeč</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="255"/> <source>Show a dialog to browse the log of the local project</source> <translation>Zobrazit dialog pro procházení logů lokálního projektu</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation><b>Zobrazit log prohlížeč</b><p>Zobrazí se dialogové okno pro procházení logů lokálního projektu. Jako první je zobrazen limit maximálního přenosu. Více záznamů může být zobrazeno později.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> + <source>Show difference</source> + <translation>Zobrazit odlišnosti</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> + <source>Show &difference</source> + <translation>Zobrazit o&dlišnosti</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> - <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> - <translation><b>Zobrazit log prohlížeč</b><p>Zobrazí se dialogové okno pro procházení logů lokálního projektu. Jako první je zobrazen limit maximálního přenosu. Více záznamů může být zobrazeno později.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> - <source>Show difference</source> - <translation>Zobrazit odlišnosti</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> - <source>Show &difference</source> - <translation>Zobrazit o&dlišnosti</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> <source>Show the difference of the local project to the repository</source> <translation>Zobrazí odlišnosti mezi lokálním projektem a repozitářem</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation><b>Zobrazit odlišnosti</b><p>Zobrazí odlišnosti mezi lokálním projektem a repozitářem.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> <source>Show difference (extended)</source> <translation>Zobrazit odlišnosti (rozšířeně)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Zobrazí odlišnosti mezi revizemi projektu v repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation><b>Zobrazit odlišnosti (rozšířeně)</b><p>Zobrazují se odlišnosti vybraných revizí vůči projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show status</source> <translation>Zobrazit status</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show &status</source> <translation>Zobrazit &status</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> + <source>Show the status of the local project</source> + <translation>Zobrazit status lokálního projektu</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation><b>Zobrazit status</b><p>Zobrazí status lokálního projektu.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <source>Show heads</source> + <translation>Zobrazit hlavy</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> - <source>Show the status of the local project</source> - <translation>Zobrazit status lokálního projektu</translation> + <source>Show the heads of the repository</source> + <translation>Zobrazit ukazatele hlav repozitáře</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation><b>Zobrazit status</b><p>Zobrazí status lokálního projektu.</p></translation> + <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> + <translation><b>Zobrazit ukazatele hlav</b><p>Zobrazí ukazatele hlav repozitáře.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> - <source>Show heads</source> - <translation>Zobrazit hlavy</translation> + <source>Show parents</source> + <translation>Zobrazit předky</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> - <source>Show the heads of the repository</source> - <translation>Zobrazit ukazatele hlav repozitáře</translation> + <source>Show the parents of the repository</source> + <translation>Zobrazit předky repozitáře</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="328"/> - <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> - <translation><b>Zobrazit ukazatele hlav</b><p>Zobrazí ukazatele hlav repozitáře.</p></translation> + <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> + <translation><b>Zobrazit předky</b><p>Zobrazí předky repozitáře.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> - <source>Show parents</source> - <translation>Zobrazit předky</translation> + <source>Show tip</source> + <translation>Zobrazit ukazatel tip</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> - <source>Show the parents of the repository</source> - <translation>Zobrazit předky repozitáře</translation> + <source>Show the tip of the repository</source> + <translation>Zobrazí ukazatel tip repozitáře</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="341"/> - <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> - <translation><b>Zobrazit předky</b><p>Zobrazí předky repozitáře.</p></translation> + <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> + <translation><b>Zobrazit ukazatele tip</b><p>Zobrazí ukazatele tip repozitáře.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <source>Revert changes</source> + <translation>Vrátit změny</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> - <source>Show tip</source> - <translation>Zobrazit ukazatel tip</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="351"/> - <source>Show the tip of the repository</source> - <translation>Zobrazí ukazatel tip repozitáře</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/> - <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> - <translation><b>Zobrazit ukazatele tip</b><p>Zobrazí ukazatele tip repozitáře.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> - <source>Revert changes</source> - <translation>Vrátit změny</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Re&vert changes</source> <translation>&Vrátit změny</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/> <source>Revert all changes made to the local project</source> <translation>Vrátit všechny změny, které byly provedeny v lokálním projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Vrátit změny</b><p>Vrátí se všechny změny, které byly provedeny v lokálním projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Merge</source> <translation>Sloučit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Mer&ge changes...</source> <translation>&Sloučit změny...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> <source>Merge changes of a revision into the local project</source> <translation>Sloučí změny revize do lokálního projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Sloučit</b><p>Sloučí se změny revize do lokálního projektu.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve conflicts</source> - <translation>Vyřešit konflikty</translation> + <translation type="obsolete">Vyřešit konflikty</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve con&flicts</source> - <translation>Vyřešit kon&flikty</translation> + <translation type="obsolete">Vyřešit kon&flikty</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="392"/> <source>Resolve all conflicts of the local project</source> - <translation>Vyřešit všechny konflikty v lokálním projektu</translation> + <translation type="obsolete">Vyřešit všechny konflikty v lokálním projektu</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> - <translation><b>Vyřešit konflikty</b><p>Vyřeší se všechny konflikty v lokálním projektu.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> + <translation type="obsolete"><b>Vyřešit konflikty</b><p>Vyřeší se všechny konflikty v lokálním projektu.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Tag in repository</source> <translation>Vytvořit tag v repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>&Tag in repository...</source> <translation>Vytvořit &tag v repozitáři...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> + <source>Tag the local project in the repository</source> + <translation>Vytvořit Tag - značku z lokálního projektu do repozitáře</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Vytvořit tag v repozitáři</b><p>Z lokálního projektu vytvoří značku - tag v repozitáři.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <source>List tags</source> + <translation>Seznam tagů</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <source>List tags...</source> + <translation>Seznam tagů...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> - <source>Tag the local project in the repository</source> - <translation>Vytvořit Tag - značku z lokálního projektu do repozitáře</translation> + <source>List tags of the project</source> + <translation>Seznam tagů projektu</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="409"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Vytvořit tag v repozitáři</b><p>Z lokálního projektu vytvoří značku - tag v repozitáři.</p></translation> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Seznam tagů</b><p>Zobrazí seznam tagů projektu.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>List tags</source> - <translation>Seznam tagů</translation> + <source>List branches</source> + <translation>Seznam větví</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>List tags...</source> - <translation>Seznam tagů...</translation> + <source>List branches...</source> + <translation>Seznam větví...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> - <source>List tags of the project</source> - <translation>Seznam tagů projektu</translation> + <source>List branches of the project</source> + <translation>Seznam větví projektu</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>Seznam tagů</b><p>Zobrazí seznam tagů projektu.</p></translation> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Seznam větví</b><p>Zobrazí seznam větví projektu.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source>List branches</source> - <translation>Seznam větví</translation> + <source>Create branch</source> + <translation>Vytvořit větev</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source>List branches...</source> - <translation>Seznam větví...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/> - <source>List branches of the project</source> - <translation>Seznam větví projektu</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Seznam větví</b><p>Zobrazí seznam větví projektu.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> - <source>Create branch</source> - <translation>Vytvořit větev</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> <source>Create &branch...</source> <translation>Narou&bovat větev...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> <source>Create a new branch for the local project in the repository</source> <translation>Vytvořit v repoziáři novou větev pro lokální projekt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Vytvořit větev</b><p>V repozitáři se vytvoří nová větev v lokálním projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> <source>Close branch</source> <translation>Zavřít větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> <source>Close the current branch of the local project</source> <translation>Zavře aktuální větev v lokálním projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Zavřít větev</b><p>Zavře aktuální větev v lokálním projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source>Switch</source> <translation>Přepnout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source>S&witch...</source> <translation>&Přepnout...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> + <source>Switch the working directory to another revision</source> + <translation>Přepnout pracovní adresář do jiné revize</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="491"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation><b>Přepnout</b><p>Přepne pracovní adresář do jiné revize.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <source>Cleanup</source> + <translation>Vyčistit</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <source>Cleanu&p</source> + <translation>Vy&prat</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> - <source>Switch the working directory to another revision</source> - <translation>Přepnout pracovní adresář do jiné revize</translation> + <source>Cleanup the local project</source> + <translation>Vyčistit lokální projekt</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> - <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> - <translation><b>Přepnout</b><p>Přepne pracovní adresář do jiné revize.</p></translation> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Vyčistit</b><p>Provede úklid lokálního projektu.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> - <source>Cleanup</source> - <translation>Vyčistit</translation> + <source>Execute command</source> + <translation>Provést příkaz</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> - <source>Cleanu&p</source> - <translation>Vy&prat</translation> + <source>E&xecute command...</source> + <translation>P&rovést příkaz...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> - <source>Cleanup the local project</source> - <translation>Vyčistit lokální projekt</translation> + <source>Execute an arbitrary Mercurial command</source> + <translation>Spustit libovolný Mercurial příkaz</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Vyčistit</b><p>Provede úklid lokálního projektu.</p></translation> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> + <translation><b>Provést příkaz</b><p>Otevře se dialogové okno pro zadání libovolného Mercurial příkazu.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> - <source>Execute command</source> - <translation>Provést příkaz</translation> + <source>Command options</source> + <translation>Parametry příkazu</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> - <source>E&xecute command...</source> - <translation>P&rovést příkaz...</translation> + <source>Command &options...</source> + <translation>&Parametry příkazu...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>Execute an arbitrary Mercurial command</source> - <translation>Spustit libovolný Mercurial příkaz</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> - <translation><b>Provést příkaz</b><p>Otevře se dialogové okno pro zadání libovolného Mercurial příkazu.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> - <source>Command options</source> - <translation>Parametry příkazu</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> - <source>Command &options...</source> - <translation>&Parametry příkazu...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>Show the Mercurial command options</source> <translation>Zobrazit parametry Mercurial příkazu</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> + <translation><b>Parametry příkazu...</b><p>Zobrazí se dialog s editací parametrů Mercurial příkazu.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Configure</source> + <translation>Konfigurovat</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Configure...</source> + <translation>Konfigurovat...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <source>Show the configuration dialog with the Mercurial page selected</source> + <translation>Zobrazit konfigurační dialog s vybranou Mercurial stranou</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> - <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> - <translation><b>Parametry příkazu...</b><p>Zobrazí se dialog s editací parametrů Mercurial příkazu.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> - <source>Configure</source> - <translation>Konfigurovat</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> - <source>Configure...</source> - <translation>Konfigurovat...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> - <source>Show the configuration dialog with the Mercurial page selected</source> - <translation>Zobrazit konfigurační dialog s vybranou Mercurial stranou</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Konfigurovat</b><p>Zobrazit konfigurační dialog s vybranou Mercurial stranou.</p></translation> </message> @@ -20501,177 +20506,177 @@ <translation type="obsolete"><b>Zobrazit kombinovaná nastavení konfigurace</b><p>Toto zobrazí kombinovaná nastavení ze všech konfigurací.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> <source>Show paths</source> <translation>Zobrazit cesty</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <source>Show paths...</source> + <translation>Zobrazit cesty...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <source>Show the aliases for remote repositories</source> + <translation>Zobrazit aliasy pro vzádelené repozitáře</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation><b>Zobrazit cesty</b><p>Zobrazí aliasy vzdálených repozitářů.</p></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> - <source>Show paths...</source> - <translation>Zobrazit cesty...</translation> + <source>Verify repository</source> + <translation>Ověřit repozitář</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <source>Verify repository...</source> + <translation>Ověřit repozitář...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> - <source>Show the aliases for remote repositories</source> - <translation>Zobrazit aliasy pro vzádelené repozitáře</translation> + <source>Verify the integrity of the repository</source> + <translation>Ověřit integritu repozitáře</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation><b>Zobrazit cesty</b><p>Zobrazí aliasy vzdálených repozitářů.</p></translation> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation><b>Ověřit integritu repozitáře</b><p>Ověří integritu repozitáře.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Verify repository</source> - <translation>Ověřit repozitář</translation> + <source>Recover</source> + <translation>Zotavit</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Verify repository...</source> - <translation>Ověřit repozitář...</translation> + <source>Recover...</source> + <translation>Zotavit...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> - <source>Verify the integrity of the repository</source> - <translation>Ověřit integritu repozitáře</translation> + <source>Recover from an interrupted transaction</source> + <translation>Zotavit z přerušené transakce</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> - <translation><b>Ověřit integritu repozitáře</b><p>Ověří integritu repozitáře.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> - <source>Recover</source> - <translation>Zotavit</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> - <source>Recover...</source> - <translation>Zotavit...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> - <source>Recover from an interrupted transaction</source> - <translation>Zotavit z přerušené transakce</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Zotavit</b><p>Obnoví integritu repozitáře narušenou přerušenou transakcí.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Repository Administration</source> <translation>Administrace repozitáře</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <source>Create .hgignore</source> + <translation>Vytvořit .hgignore</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <source>Create a .hgignore file with default values</source> + <translation>Vytvořit soubor .hgignore s výchozími hodnotami</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation><p>Vytvořit .hgignore<br>Vytvoří soubor .hgignore s výchozími hodnotami.</p></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> - <source>Create .hgignore</source> - <translation>Vytvořit .hgignore</translation> + <source>Create changegroup</source> + <translation>Vytvořit skupinu změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <source>Create changegroup...</source> + <translation>Vytvořit skupinu změn...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> - <source>Create a .hgignore file with default values</source> - <translation>Vytvořit soubor .hgignore s výchozími hodnotami</translation> + <source>Create changegroup file collecting changesets</source> + <translation>Vytvořit soubor s skupinou změn obsahující množinu změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> + <source>Apply changegroups</source> + <translation>Použít skupinu změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <source>Apply changegroups...</source> + <translation>Použít skupinu změn...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> + <source>Apply one or several changegroup files</source> + <translation>Použít soubory s jednou nebo více skupinami změn</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> + <source>Changegroup Management</source> + <translation>Správa skupin změn</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation><p>Vytvořit .hgignore<br>Vytvoří soubor .hgignore s výchozími hodnotami.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Create changegroup</source> - <translation>Vytvořit skupinu změn</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Create changegroup...</source> - <translation>Vytvořit skupinu změn...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> - <source>Create changegroup file collecting changesets</source> - <translation>Vytvořit soubor s skupinou změn obsahující množinu změn</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> - <source>Apply changegroups</source> - <translation>Použít skupinu změn</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> - <source>Apply changegroups...</source> - <translation>Použít skupinu změn...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> - <source>Apply one or several changegroup files</source> - <translation>Použít soubory s jednou nebo více skupinami změn</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> - <source>Changegroup Management</source> - <translation>Správa skupin změn</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Vytvořit skupin změn</b><p>Vytvoří soubor se skupinou změn obsahující vybrané množiny změn (hg bundle).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Použít skupinu změn</b><p>Použije se soubor vygenerovaný příkazem 'Vytvořit skupinu změn', s jednou nebo více skupinami změn (hg unbundle)</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source>Show current branch</source> <translation>Zobrazit aktuální větev</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> <source>Show the current branch of the project</source> <translation>Zobrazit aktuální větev projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Zobrazit aktuální větev</b><p>Zobrazí se aktuální větev projektu.</p></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Mark as "good"</source> + <translation>Označit jako "v pořádku"</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <source>Mark a selectable changeset as good</source> + <translation>Označit volitelnou množinu změn, že je v pořádku</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation><b>Označit jako "v pořádku"</b><p>Označí se volitelná množina změn, že je v pořádku.</p></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> - <source>Mark as "good"</source> - <translation>Označit jako "v pořádku"</translation> + <source>Mark as "bad"</source> + <translation>Označit jako "špatná"</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> - <source>Mark a selectable changeset as good</source> - <translation>Označit volitelnou množinu změn, že je v pořádku</translation> + <source>Mark a selectable changeset as bad</source> + <translation>Označit volitelnou množinu změn jako špatnou</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation><b>Označit jako "v pořádku"</b><p>Označí se volitelná množina změn, že je v pořádku.</p></translation> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation><b>Označit jako "špatná"</b><p>Označí se volitelná množina změn, že je špatná.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Mark as "bad"</source> - <translation>Označit jako "špatná"</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> - <source>Mark a selectable changeset as bad</source> - <translation>Označit volitelnou množinu změn jako špatnou</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> - <translation><b>Označit jako "špatná"</b><p>Označí se volitelná množina změn, že je špatná.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source>Skip</source> <translation>Přeskočit</translation> </message> @@ -20686,107 +20691,107 @@ <translation type="obsolete"><b>Přeskočit</b><p>Aktuální množina změn se přeskočí.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source>Reset</source> <translation>Reset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Reset the bisect search data</source> <translation>Reset vyhledávání bisect</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Reset</b><p>Zresetuje bisect vyhledávání v datech.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Mark as "good"...</source> + <translation>Označit jako "v pořádku"...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> - <source>Mark as "good"...</source> - <translation>Označit jako "v pořádku"...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"...</source> <translation>Označit jako "špatná"...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Preview changegroup</source> <translation>Náhled skupiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Preview changegroup...</source> <translation>Náhled skupiny změn...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Identify</source> <translation>Identifikovat</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Identify...</source> <translation>Identifikovat...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> <source>Identify the project directory</source> <translation>Identifikovat adresář projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identifikovat</b><p>Identifikuje se adresář projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="671"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Náhled souboru skupiny změn obsahující množiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Náhled skupiny změn</b><p>Zobrazí náhled souboru skupiny změn obsahující množiny změn.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Identify changegroup</source> <translation>Identifikovat skupinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Identify changegroup...</source> <translation>Identifikovat skupinu změn...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation>Identifikuje soubor se skupinou změn obsahující množinu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation><b>Identifikovat skupinu změn</b><p>Identifikuje soubor se skupinou změn obsahující množinu změn.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Back out changeset</source> <translation>Vycouvat z množiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Back out changes of an earlier changeset</source> <translation>Vrátit změny z předchozí množiny změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Vycouvat z množiny změn</b><p>Vrátit změny z předchozí množiny změn.</p></translation> </message> @@ -20806,260 +20811,280 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094"/> <source>Pull</source> <translation type="unfinished">Stáhnout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Projekt bude znovu načten. Má se provést?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care.</strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> + <source>Show an editor to edit the user configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit user configuration</source> + <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit user configuration...</source> + <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> - <source>Show an editor to edit the user configuration file</source> + <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Edit repository configuration</source> + <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> - <source>Show an editor to edit the repository configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="578"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1311"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Import Patch...</source> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> - <source>Import a patch from a patch file</source> + <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> - <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> - <source>Patch Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344"/> - <source>Revert Changes</source> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> - <source>Export Patches</source> + <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> - <source>Export Patches...</source> + <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/> - <source>Export revisions to patch files</source> + <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> - <source>Change Phase...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> - <source>Change the phase of revisions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1349"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856"/> + <source>Copies changesets from another branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> - <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -30429,7 +30454,7 @@ <translation><b>Pokrytí kódu...</b><p>Zobrazí informace o pokrytí kódu ve všech python souborech projektu.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3901"/> + <location filename="Project/Project.py" line="3903"/> <source>Profile Data</source> <translation>Profilovat data</translation> </message> @@ -30449,7 +30474,7 @@ <translation><b>Profilovat data</b><p>Zobrazí se profilování dat projektu.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3954"/> + <location filename="Project/Project.py" line="3956"/> <source>Application Diagram</source> <translation>Diagram aplikace</translation> </message> @@ -30544,37 +30569,37 @@ <translation>Version Control System</translation> </message> <message> - <location filename="Project/Project.py" line="3834"/> + <location filename="Project/Project.py" line="3836"/> <source>Coverage Data</source> <translation>Datové pokrytí</translation> </message> <message> - <location filename="Project/Project.py" line="3880"/> + <location filename="Project/Project.py" line="3882"/> <source>There is no main script defined for the current project. Aborting</source> <translation>V aktuálním projektu nebyl určen hlavní skript. Zrušeno</translation> </message> <message> - <location filename="Project/Project.py" line="3855"/> + <location filename="Project/Project.py" line="3857"/> <source>Code Coverage</source> <translation>Pokrytí kódu</translation> </message> <message> - <location filename="Project/Project.py" line="3855"/> + <location filename="Project/Project.py" line="3857"/> <source>Please select a coverage file</source> <translation>Prosím, vyberte soubor pokrytí</translation> </message> <message> - <location filename="Project/Project.py" line="3901"/> + <location filename="Project/Project.py" line="3903"/> <source>Please select a profile file</source> <translation>Prosím, vyberte soubor s profilem</translation> </message> <message> - <location filename="Project/Project.py" line="3954"/> + <location filename="Project/Project.py" line="3956"/> <source>Include module names?</source> <translation>Včetně jmen modulů?</translation> </message> <message> - <location filename="Project/Project.py" line="4085"/> + <location filename="Project/Project.py" line="4087"/> <source>Create Package List</source> <translation>Vytvořit seznam balíčků</translation> </message> @@ -30584,7 +30609,7 @@ <translation>Vytvořit seznam &balíčků</translation> </message> <message> - <location filename="Project/Project.py" line="4245"/> + <location filename="Project/Project.py" line="4247"/> <source>Create Plugin Archive</source> <translation>Vytvořit Plugin archiv</translation> </message> @@ -30594,17 +30619,17 @@ <translation>Vytvořit Plugin &archiv</translation> </message> <message> - <location filename="Project/Project.py" line="4058"/> + <location filename="Project/Project.py" line="4060"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation><p>Soubor <b>PKGLIST</b> již existuje.</p><p>Přepsat jej?</p></translation> </message> <message> - <location filename="Project/Project.py" line="4102"/> + <location filename="Project/Project.py" line="4104"/> <source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source> <translation><p>Soubor <b>PKGLIST</b> neexistuje. Zrušeno...</p></translation> </message> <message> - <location filename="Project/Project.py" line="4110"/> + <location filename="Project/Project.py" line="4112"/> <source>The project does not have a main script defined. Aborting...</source> <translation>Projekt nemá definován hlavní skript. Zrušeno...</translation> </message> @@ -30879,32 +30904,32 @@ <translation><p>Vybrané VCS <b>{0}</b> nebylo nalezeno.<br/>Kontrola verzí vypnuta.</p><p>{1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4085"/> + <location filename="Project/Project.py" line="4087"/> <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> <translation><p>Soubor <b>PKGLIST</b> nelze vytvořit.</p><p>Důvod: {0}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4122"/> + <location filename="Project/Project.py" line="4124"/> <source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source> <translation><p>Soubor <b>PKGLIST</b> nelze načíst.</p><p>Důvod: {0}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4133"/> + <location filename="Project/Project.py" line="4135"/> <source><p>The eric5 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation><p>Soubor s eric5 plugin archivem <b>{0}</b> nelze vytvořit. Zrušeno...</p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4153"/> + <location filename="Project/Project.py" line="4155"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation><p>Soubor <b>{0}</b> nelze uložit do archivu. Ingorováno.</p><p>Důvod: {1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4165"/> + <location filename="Project/Project.py" line="4167"/> <source><p>The eric5 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation><p>Soubor s eric5 plugin archivem <b>{0}</b> byl úspěšně vytvořen.</p></translation> </message> <message> - <location filename="Project/Project.py" line="4245"/> + <location filename="Project/Project.py" line="4247"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation><p>Plugin soubor <b>{0}</b> nelze přečíst.</p><p>Důvod: {1}</p></translation> </message> @@ -39304,182 +39329,182 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="221"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> <source>Create project in repository</source> <translation>Vytvořit projekt v repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="221"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>Projekt nemůže být v repozitáři vytvořen. Buďto daný repozitář neexistuje nebo se nelze připojit k serveru s repozitářem.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> <source>New project</source> <translation>Nový projekt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>Projekt se nepodařilo stáhnout (checkout) z repozitáře. <br />Obnovuji původní obsah.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="314"/> <source>Importing project into Subversion repository</source> <translation>Importovat projekt do Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="363"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="364"/> <source>Subversion Checkout</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>Tag musí být normální tag (tagy) nebo tag větve (větví). Prosím vyberte ze seznamu.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="385"/> <source>Checking project out of Subversion repository</source> <translation>Checkout projektu ze Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> <source>Subversion Export</source> <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="445"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="446"/> <source>Exporting project from Subversion repository</source> <translation>Exportuje projekt z Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="530"/> <source>Commiting changes to Subversion repository</source> <translation>Commit změn do Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="585"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="586"/> <source>Synchronizing with the Subversion repository</source> <translation>Synchronizovat se Subversion repozitářem</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="686"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="687"/> <source>Adding files/directories to the Subversion repository</source> <translation>Přidat soubory/adresáře do Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="785"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="786"/> <source>Adding directory trees to the Subversion repository</source> <translation>Přidat strom adresářů do Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="820"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> <source>Removing files/directories from the Subversion repository</source> <translation>Odebrat soubory/adresáře ze Subversion repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> <source>Subversion Error</source> <translation>Subversion chyba</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="986"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="987"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>Z pracovní kopie nelze získat URL repozitáře projektu. Operace tagování bude zrušena</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1010"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1011"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>URL repozitáře projektu má neplatný formát. Operace tagování bude zrušena</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1074"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1075"/> <source>Reverting changes</source> <translation>Navrácení změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1101"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1102"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>Z pracovní kopie nelze získat URL repozitáře projektu. Operace přepínání bude zrušena</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>URL repozitáře projektu má neplatný formát. Operace přepínání bude zrušena</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1548"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Subversion command</source> <translation>Subversion příkaz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1655"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1670"/> <source>Resolving conficts</source> <translation>Řešení konfliktů</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1776"/> <source>Subversion Set Property</source> <translation>Nastavit Subversion vlastnost</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1794"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1809"/> <source>You have to supply a property name. Aborting.</source> <translation>Musíte doplnit jméno vlastnosti. Zrušeno.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1812"/> - <source>Subversion Delete Property</source> - <translation>Smazat Subversion vlastnost</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1632"/> - <source>Enter property name</source> - <translation>Zadejte jméno vlastnosti</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="922"/> - <source>Subversion Log</source> - <translation></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="922"/> - <source>Select number of entries to show.</source> - <translation>Vyberte počet položek, které se mají zobrazit.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1978"/> - <source>Locking in the Subversion repository</source> - <translation>Zamknout v Subversion repozitáři</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2016"/> - <source>Unlocking in the Subversion repository</source> - <translation>Odemknout v Subversion repozitáři</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1777"/> - <source>Property set.</source> - <translation>Vlastnost nastavena.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> + <source>Subversion Delete Property</source> + <translation>Smazat Subversion vlastnost</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1647"/> + <source>Enter property name</source> + <translation>Zadejte jméno vlastnosti</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <source>Subversion Log</source> + <translation></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <source>Select number of entries to show.</source> + <translation>Vyberte počet položek, které se mají zobrazit.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1993"/> + <source>Locking in the Subversion repository</source> + <translation>Zamknout v Subversion repozitáři</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2031"/> + <source>Unlocking in the Subversion repository</source> + <translation>Odemknout v Subversion repozitáři</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1792"/> + <source>Property set.</source> + <translation>Vlastnost nastavena.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1842"/> <source>Property deleted.</source> <translation>Vlastnost smazána.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1958"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> <source>Subversion Lock</source> <translation>Subversion zámek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1958"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> <source>Enter lock comment</source> <translation>Zadejte komentář zámku</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2076"/> <source>Relocating</source> <translation></translation> </message> @@ -39634,37 +39659,37 @@ <translation>mimo verzi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="195"/> <source>The svn process did not finish within 30s.</source> <translation>Proces svn neskončil do 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="196"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="197"/> <source>Could not start the svn executable.</source> <translation>Nelze spustit svn proces.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> <source>Repository Browser</source> <translation>Prohlížeč repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> <source>Enter the repository URL.</source> <translation>Zadejte URL repozitáře.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2111"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2126"/> <source>Remove from changelist</source> <translation>Odebrat ze seznamu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2162"/> <source>Add to changelist</source> <translation>Přidat do seznamu změn</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2137"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2152"/> <source>Enter name of the changelist:</source> <translation>Zadejte název seznamu změn:</translation> </message> @@ -39684,53 +39709,53 @@ <translation>Seznam změn byl přesunut</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> <source>The svn process finished with the exit code {0}</source> <translation>Proces svn skončil exit kódem {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="882"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="883"/> <source>Moving {0}</source> <translation>Přesun {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> <source>Tagging {0} in the Subversion repository</source> <translation>Tagování {0} v Subversion repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1148"/> <source>Switching to {0}</source> <translation>Přepínání do {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1249"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1250"/> <source>Merging {0}</source> <translation>Sloučení {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1512"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1527"/> <source>Cleaning up {0}</source> <translation>Vyčištění {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1694"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1709"/> <source>Copying {0}</source> <translation>Kopírování {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="329"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="330"/> <source>Imported revision {0}. </source> <translation>Inportovaná revize {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="554"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="555"/> <source>Committed revision {0}.</source> <translation>Zapsaná revize {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1154"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> <source>Revision {0}. </source> <translation>Revize {0}.</translation> @@ -41273,7 +41298,7 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> <source>Resolve conflict</source> - <translation>Vyřešit konflikty</translation> + <translation type="obsolete">Vyřešit konflikty</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="388"/> @@ -41360,6 +41385,11 @@ <source>Remove from Changelist</source> <translation>Odebrat ze seznamu změn</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> + <source>Conflict resolved</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -41426,60 +41456,60 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>Add to repository</source> - <translation>Přidat do repozitáře</translation> + <translation type="obsolete">Přidat do repozitáře</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>&Add to repository...</source> - <translation>Přid&at do repozitáře...</translation> + <translation type="obsolete">Přid&at do repozitáře...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="92"/> <source>Add the local project to the VCS repository</source> - <translation>Přidat lokální projekt do VCS repozitáře</translation> + <translation type="obsolete">Přidat lokální projekt do VCS repozitáře</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="95"/> <source><b>Add to repository</b><p>This adds (imports) the local project to the VCS repository.</p></source> - <translation><b>Přidat do repozitáře</b><p>Přidá (importuje) lokální projekt do VCS repozitáře.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="102"/> + <translation type="obsolete"><b>Přidat do repozitáře</b><p>Přidá (importuje) lokální projekt do VCS repozitáře.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>Remove from repository (and disk)</source> <translation>Odebrat z repozitáře (a z disku)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>&Remove from repository (and disk)</source> <translation>Odeb&rat z repozitáře (a z disku)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="93"/> <source>Remove the local project from the VCS repository (and disk)</source> <translation>Odebrat lokální projekt z VCS repozitáře (a z disku)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="109"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="96"/> <source><b>Remove from repository</b><p>This removes the local project from the VCS repository (and disk).</p></source> <translation><b>Odebrat z repozitáře</b><p>Lokální projekt se odebere z VCS repozitáře (a z disku).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> <source>Show log</source> <translation>Zobrazit log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> <source>Show &log</source> <translation>Zobrazit &log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="121"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="108"/> <source>Show the log of the local project</source> <translation>Zobrazit log lokálního projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="124"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="111"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Zobrazit log</b><p>Zobrazí log lokálního projektu.</p></translation> </message> @@ -41499,465 +41529,485 @@ <translation type="obsolete"><b>Zobrazit limitovaný log</b><p>Zobrazuje log lokálního projektu jen do určitého počtu záznamů.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/> <source>Show difference</source> <translation>Zobrazit odlišnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/> <source>Show &difference</source> <translation>Zobrazit o&dlišnosti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/> <source>Show the difference of the local project to the repository</source> <translation>Zobrazí odlišnosti mezi lokálním projektem a repozitářem</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="141"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation><b>Zobrazit odlišnosti</b><p>Zobrazí odlišnosti mezi lokálním projektem a repozitářem.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="161"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="148"/> <source>Show difference (extended)</source> <translation>Zobrazit odlišnosti (rozšířeně)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Zobrazí odlišnosti mezi revizemi projektu v repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="155"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation><b>Zobrazit odlišnosti (rozšířeně)</b><p>Zobrazují se odlišnosti vybraných revizí vůči projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="177"/> <source>Show status</source> <translation>Zobrazit status</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="177"/> <source>Show &status</source> <translation>Zobrazit &status</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="181"/> <source>Show the status of the local project</source> <translation>Zobrazit status lokálního projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Zobrazit status</b><p>Zobrazí status lokálního projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>Tag in repository</source> <translation>Vytvořit tag v repozitáři</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>&Tag in repository...</source> <translation>Vytvořit &tag v repozitáři...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> <source>Tag the local project in the repository</source> <translation>Vytvořit Tag - značku z lokálního projektu do repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Vytvořit tag v repozitáři</b><p>Z lokálního projektu vytvoří značku - tag v repozitáři.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> <source>Export from repository</source> <translation>Exportovat z repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> <source>&Export from repository...</source> <translation>&Exportovat z repozitáře...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="224"/> + <source>Export a project from the repository</source> + <translation>Export projekt z repozitáře</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="227"/> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>Exportovat z repozitáře</b><p>Exportuje projekt z repozitáře.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <source>Command options</source> + <translation>Parametry příkazu</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <source>Command &options...</source> + <translation>&Parametry příkazu...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> - <source>Export a project from the repository</source> - <translation>Export projekt z repozitáře</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="240"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation><b>Exportovat z repozitáře</b><p>Exportuje projekt z repozitáře.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> - <source>Command options</source> - <translation>Parametry příkazu</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> - <source>Command &options...</source> - <translation>&Parametry příkazu...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="250"/> <source>Show the VCS command options</source> <translation>Zobrazit parametry VCS příkazu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="251"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> <translation><b>Parametry příkazu...</b><p>Zobrazí se dialog s editací parametrů VCS příkazu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Revert changes</source> <translation>Vrátit změny</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Re&vert changes</source> <translation>&Vrátit změny</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> <source>Revert all changes made to the local project</source> <translation>Vrátit všechny změny, které byly provedeny v lokálním projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="265"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Vrátit změny</b><p>Vrátí se všechny změny, které byly provedeny v lokálním projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> <source>Merge</source> <translation>Sloučit</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> <source>Mer&ge changes...</source> <translation>&Sloučit změny...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="263"/> <source>Merge changes of a tag/revision into the local project</source> <translation>Sloučit změny tagu/revize do lokálního projektu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="279"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Sloučit</b><p>Sloučí se změny tagu/revize do lokálního projektu.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> <source>Switch</source> <translation>Přepnout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> <source>S&witch...</source> <translation>&Přepnout...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> <source>Switch the local copy to another tag/branch</source> <translation>Přepnout lokální kopii do jiného tagu/větve</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>Přepnout</b><p>Přepne lokální kopii do jiného tagu/větve.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Resolve conflicts</source> - <translation>Vyřešit konflikty</translation> + <translation type="obsolete">Vyřešit konflikty</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Resolve con&flicts</source> - <translation>Vyřešit kon&flikty</translation> + <translation type="obsolete">Vyřešit kon&flikty</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> <source>Resolve all conflicts of the local project</source> - <translation>Vyřešit všechny konflikty v lokálním projektu</translation> + <translation type="obsolete">Vyřešit všechny konflikty v lokálním projektu</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> - <translation><b>Vyřešit konflikty</b><p>Vyřeší se všechny konflikty v lokálním projektu.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <translation type="obsolete"><b>Vyřešit konflikty</b><p>Vyřeší se všechny konflikty v lokálním projektu.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Cleanup</source> <translation>Vyčistit</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <source>Cleanu&p</source> + <translation>V&yčistit</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> + <source>Cleanup the local project</source> + <translation>Vyčistit lokální projekt</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Vyčistit</b><p>Provede úklid lokálního projektu.</p></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> - <source>Cleanu&p</source> - <translation>V&yčistit</translation> + <source>Execute command</source> + <translation>Provést příkaz</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <source>E&xecute command...</source> + <translation>P&rovést příkaz...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> - <source>Cleanup the local project</source> - <translation>Vyčistit lokální projekt</translation> + <source>Execute an arbitrary VCS command</source> + <translation>Provede se libovolný VCS příkaz</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Vyčistit</b><p>Provede úklid lokálního projektu.</p></translation> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> + <translation><b>Provést příkaz</b><p>Otevře se dialogové okno pro zadání libovolného příkazu.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> - <source>Execute command</source> - <translation>Provést příkaz</translation> + <source>List tags</source> + <translation>Seznam tagů</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> - <source>E&xecute command...</source> - <translation>P&rovést příkaz...</translation> + <source>List tags...</source> + <translation>Seznam tagů...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> - <source>Execute an arbitrary VCS command</source> - <translation>Provede se libovolný VCS příkaz</translation> + <source>List tags of the project</source> + <translation>Seznam tagů projektu</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> - <translation><b>Provést příkaz</b><p>Otevře se dialogové okno pro zadání libovolného příkazu.</p></translation> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Seznam tagů</b><p>Zobrazí seznam tagů projektu.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> - <source>List tags</source> - <translation>Seznam tagů</translation> + <source>List branches</source> + <translation>Seznam větví</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> - <source>List tags...</source> - <translation>Seznam tagů...</translation> + <source>List branches...</source> + <translation>Seznam větví...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> - <source>List tags of the project</source> - <translation>Seznam tagů projektu</translation> + <source>List branches of the project</source> + <translation>Seznam větví projektu</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>Seznam tagů</b><p>Zobrazí seznam tagů projektu.</p></translation> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Seznam větví</b><p>Zobrazí seznam větví projektu.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> - <source>List branches</source> - <translation>Seznam větví</translation> + <source>List repository contents</source> + <translation>Seznam obsahu repozitáře</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> - <source>List branches...</source> - <translation>Seznam větví...</translation> + <source>List repository contents...</source> + <translation>Seznam obsahu repozitáře...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> - <source>List branches of the project</source> - <translation>Seznam větví projektu</translation> + <source>Lists the contents of the repository</source> + <translation>Vypisuje seznam obsahu repozitáře</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Seznam větví</b><p>Zobrazí seznam větví projektu.</p></translation> + <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> + <translation><b>Seznam obsahu repozitáře</b><p>Zobrazuje seznam obsahu repozitáře.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> - <source>List repository contents</source> - <translation>Seznam obsahu repozitáře</translation> + <source>Set Property</source> + <translation>Nastavit vlastnosti</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> - <source>List repository contents...</source> - <translation>Seznam obsahu repozitáře...</translation> + <source>Set Property...</source> + <translation>Nastavit vlastnosti...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> - <source>Lists the contents of the repository</source> - <translation>Vypisuje seznam obsahu repozitáře</translation> + <source>Set a property for the project files</source> + <translation>Nastaví vlastnosti souborů projektu</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> - <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> - <translation><b>Seznam obsahu repozitáře</b><p>Zobrazuje seznam obsahu repozitáře.</p></translation> + <source><b>Set Property</b><p>This sets a property for the project files.</p></source> + <translation><b>Nastavit vlastnosti</b><p>Nastavuje vlastnosti souborů projektu.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> - <source>Set Property</source> - <translation>Nastavit vlastnosti</translation> + <source>List Properties</source> + <translation>Seznam vlastností</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> - <source>Set Property...</source> - <translation>Nastavit vlastnosti...</translation> + <source>List Properties...</source> + <translation>Seznam vlastností...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> - <source>Set a property for the project files</source> - <translation>Nastaví vlastnosti souborů projektu</translation> + <source>List properties of the project files</source> + <translation>Seznam vlastností souborů projektu</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> - <source><b>Set Property</b><p>This sets a property for the project files.</p></source> - <translation><b>Nastavit vlastnosti</b><p>Nastavuje vlastnosti souborů projektu.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> - <source>List Properties</source> - <translation>Seznam vlastností</translation> + <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> + <translation><b>Seznam vlastností</b><p>Vypisuje seznam vlastností souborů projektu.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> - <source>List Properties...</source> - <translation>Seznam vlastností...</translation> + <source>Delete Property</source> + <translation>Smazat vlastnost</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> + <source>Delete Property...</source> + <translation>Smazat vlastnost...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> - <source>List properties of the project files</source> - <translation>Seznam vlastností souborů projektu</translation> + <source>Delete a property for the project files</source> + <translation>Smaže vlastnost pro soubory projektu</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> - <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> - <translation><b>Seznam vlastností</b><p>Vypisuje seznam vlastností souborů projektu.</p></translation> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation><b>Smazat vlastnost</b><p>Smaže vlastnost pro soubory projektu.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> + <source>Show repository info</source> + <translation>Zobrazit info repozitáře</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> + <source>Show some repository related information for the local project</source> + <translation>Zobrazí nějaké infomace související s repozitářem pro lokální projekt</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> + <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> + <translation><b>Zobrazit info repozitáře</b><p>Zobrazí nějaké infomace související s repozitářem pro lokální projekt.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> - <source>Delete Property</source> - <translation>Smazat vlastnost</translation> + <source>Relocate</source> + <translation>Přemístit</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> - <source>Delete Property...</source> - <translation>Smazat vlastnost...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> - <source>Delete a property for the project files</source> - <translation>Smaže vlastnost pro soubory projektu</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="410"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation><b>Smazat vlastnost</b><p>Smaže vlastnost pro soubory projektu.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="204"/> - <source>Show repository info</source> - <translation>Zobrazit info repozitáře</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="208"/> - <source>Show some repository related information for the local project</source> - <translation>Zobrazí nějaké infomace související s repozitářem pro lokální projekt</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> - <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> - <translation><b>Zobrazit info repozitáře</b><p>Zobrazí nějaké infomace související s repozitářem pro lokální projekt.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> - <source>Relocate</source> - <translation>Přemístit</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> <source>Relocate...</source> <translation>Přemístit...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="408"/> <source>Relocate the working copy to a new repository URL</source> <translation>Přemístit pracovní kopii do nového URL repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="424"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="411"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>Přemístit</b><p>Pracovní kopie se přemístí na nové URL repozitáře.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="175"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="162"/> <source>Show difference (URLs)</source> <translation>Zobrazit odlišnosti (na URL)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="166"/> <source>Show the difference of the project between two repository URLs</source> <translation>Zobrazit odlišnosti v projektu mezi dvěma repozitáři na URL</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> <source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source> <translation><b>Zobrazit odlišnosti (na URL)</b><p>Zobrazují se odlišnosti v projektu mezi dvěma repozitáři na URL.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> <source>Repository Browser</source> <translation>Prohlížeč repozitáře</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> <source>Repository Browser...</source> <translation>Prohlížeč repozitáře...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <source>Show the Repository Browser dialog</source> + <translation>Zobrazit dialog prohlížeče repozitáře</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation><b>Prohlížeč repozitáře</b><p>Zobrazí se dialogové okno prohlížeče repozitáře.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="118"/> + <source>Show log browser</source> + <translation>Zobrazit log prohlížeč</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/> + <source>Show a dialog to browse the log of the local project</source> + <translation>Zobrazit dialog pro procházení logů lokálního projektu</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="125"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation><b>Zobrazit log prohlížeč</b><p>Zobrazí se dialogové okno pro procházení logů lokálního projektu. Jako první je zobrazen limit maximálního přenosu. Více záznamů může být zobrazeno později.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <source>Configure</source> + <translation>Konfigurovat</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <source>Configure...</source> + <translation>Konfigurovat...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> - <source>Show the Repository Browser dialog</source> - <translation>Zobrazit dialog prohlížeče repozitáře</translation> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation>Zobrazit konfigurační dialog s vybranou Subversion stranou</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation><b>Prohlížeč repozitáře</b><p>Zobrazí se dialogové okno prohlížeče repozitáře.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> - <source>Show log browser</source> - <translation>Zobrazit log prohlížeč</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="135"/> - <source>Show a dialog to browse the log of the local project</source> - <translation>Zobrazit dialog pro procházení logů lokálního projektu</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/> - <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> - <translation><b>Zobrazit log prohlížeč</b><p>Zobrazí se dialogové okno pro procházení logů lokálního projektu. Jako první je zobrazen limit maximálního přenosu. Více záznamů může být zobrazeno později.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> - <source>Configure</source> - <translation>Konfigurovat</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> - <source>Configure...</source> - <translation>Konfigurovat...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> - <source>Show the configuration dialog with the Subversion page selected</source> - <translation>Zobrazit konfigurační dialog s vybranou Subversion stranou</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation><b>Konfigurovat</b><p>Zobrazit konfigurační dialog s vybranou Subversion stranou.</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnPropDelDialog</name> @@ -50872,17 +50922,17 @@ <context> <name>VersionControl</name> <message> - <location filename="VCS/VersionControl.py" line="536"/> + <location filename="VCS/VersionControl.py" line="547"/> <source>Process Generation Error</source> <translation>Chyba v procesu generování</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="662"/> + <location filename="VCS/VersionControl.py" line="673"/> <source>Repository status checking is switched off</source> <translation>Kontrolování stavu v repozitáři je vypnuto</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="536"/> + <location filename="VCS/VersionControl.py" line="547"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Proces {0} nelze spustit. Ověřte, že je umístěn v požadované cestě.</translation> </message> @@ -54615,30 +54665,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1236"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Rodič #{0}</b></td><td></td></tr><tr><td><b>Množina změn</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1733"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tagy</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1741"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Větve</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1252"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr></source> <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -54649,23 +54699,23 @@ <translation><h3>Informace o repozitáře</h3><p><table><tr><td><b>Mercurial V.</b></td><td>{0}</td></tr><tr></tr><tr><td><b>URL</b></td><td>{1}</td></tr></table></p>{2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Množina změn</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1745"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Rodiče</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1734"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/> <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> @@ -54673,7 +54723,7 @@ <translation><tr><td><b>Poslední autor</b></td><td>{0}</td></tr><tr><td><b>Datum zapsání změn</b></td><td>{1}</td></tr><tr><td><b>Čas zapsání změn</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -54917,17 +54967,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1589"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1604"/> <source>unknown</source> <translation>neznámý</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1458"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1473"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Informace z repozitáře</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Aktuální revize</b></td><td>{2}</td></tr><tr><td><b>Revize zápisu změn</b></td><td>{3}</td></tr><tr><td><b>Datum zápisu změn</b></td><td>{4}</td></tr><tr><td><b>Čas zápisu změn</b></td><td>{5}</td></tr><tr><td><b>Poslední autor</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1590"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Informace z repozitáře</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Aktuální revize</b></td><td>{4}</td></tr><tr><td><b>Revize zápisu změn</b></td><td>{5}</td></tr><tr><td><b>Datum zápisu změn</b></td><td>{6}</td></tr><tr><td><b>Čas zápisu změn</b></td><td>{7}</td></tr><tr><td><b>Poslední autor</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_de.ts Mon May 28 15:59:36 2012 +0200 +++ b/i18n/eric5_de.ts Tue May 29 20:59:40 2012 +0200 @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="de"> +<!DOCTYPE TS><TS version="2.0" language="de" sourcelanguage=""> <context> <name>AboutDialog</name> <message> @@ -1783,7 +1782,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksMenu.py" line="142"/> - <source>Open in New &Tab Ctrl+LMB</source> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -2020,7 +2019,7 @@ </message> <message> <location filename="Helpviewer/Bookmarks/BookmarksToolBar.py" line="90"/> - <source>Open in New &Tab Ctrl+LMB</source> + <source>Open in New &Tab<byte value="x9"/>Ctrl+LMB</source> <translation>In neuem &Register öffnen\tStrg+LMK</translation> </message> </context> @@ -13665,7 +13664,7 @@ </message> <message> <location filename="Helpviewer/HelpBrowserWV.py" line="910"/> - <source>Open Link in New Tab Ctrl+LMB</source> + <source>Open Link in New Tab<byte value="x9"/>Ctrl+LMB</source> <translation>Link in neuem Fenster öffnen\tStrg+LMK</translation> </message> </context> @@ -16517,277 +16516,277 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/> <source>The hg process finished with the exit code {0}</source> <translation>Der hg Prozess endete mit dem Code {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="252"/> - <source>The hg process did not finish within 30s.</source> - <translation>Der hg Prozess endete nicht innerhalb von 30s.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="254"/> + <source>The hg process did not finish within 30s.</source> + <translation>Der hg Prozess endete nicht innerhalb von 30s.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="256"/> <source>Could not start the hg executable.</source> <translation>Das hg Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> <source>Create project repository</source> <translation>Projektrepository anlegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> <source>The project repository could not be created.</source> <translation>Das Projektrepository konnte nicht erzeugt werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="310"/> <source>Creating Mercurial repository</source> <translation>Lege Mercurial Repository an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="325"/> <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="369"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="371"/> <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="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="533"/> <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="583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="585"/> <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="647"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="649"/> <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="711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/> <source>Renaming {0}</source> <translation>Benenne {0} um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="840"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="842"/> <source>Taging in the Mercurial repository</source> <translation>Marke im Mercurial Repository setzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="873"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="875"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="925"/> <source>Merging</source> <translation>Zusammenführen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1176"/> <source>Mercurial command</source> <translation>Mercurial Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1352"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1597"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1611"/> <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="1650"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> <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="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Resolving files/directories</source> <translation>Löse Dateien/Verzeichnisse auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> <source>Create Branch</source> <translation>Zweig erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> <source>Enter branch name</source> <translation>Gib den Zweignamen ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> <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="1882"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> <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="1907"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Showing the combined configuration settings</source> <translation>Zeige die kombinierten Einstellungen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <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="1953"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>Recovering from interrupted transaction</source> <translation>Setze abgebrochene Transaktion zurück</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> <source>Shall the working directory be updated?</source> <translation>Soll das Arbeitsverzeichnis aktualisiert werden?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1839"/> <source>Showing current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <source>Create changegroup</source> <translation>Änderungsgruppe erzeugen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> <source>Apply changegroups</source> <translation>Änderungsgruppen anwenden</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Ungültiger Bisect Unterbefehl ({0}).</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1976"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> <source>Identifying project directory</source> <translation>Projektverzeichnis identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Create .hgignore file</source> <translation>.hgignore Datei erstellen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Die Datei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2305"/> <source>Removing files from the Mercurial repository only</source> <translation>Lösche Dateien nur aus dem Mercurial Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Änderungsgruppendateien (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2185"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Änderungsgruppendateien (*.hg);;Alle Dateien (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <source>Identifying changegroup file</source> <translation>Identifiziere Änderungsgruppendatei</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> <source>Backing out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> <source>No revision given. Aborting...</source> <translation>Keine Revision angegeben. Abbruch...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Die Mercurial Änderungsgruppendatei <b>{0}</b> existiert bereits. Überschreiben?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2367"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2381"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Wollen sie die letzte Transaktion wirklich zurücksetzen?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="479"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="481"/> <source>Committing changes to Mercurial repository</source> <translation>Pflege Änderungen in das Mercurial Repository ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> <source>Mercurial Command Server</source> <translation>Mercurial Befehlsserver</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial Befehlsserver konnte nicht wiedergestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Der Mercurial Befehlsserver konnte nicht gestartet werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/> <source>Export Patches</source> <translation>Patches exportieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <source>Change Phase</source> <translation>Phase ändern</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> <source>Copy Changesets</source> <translation>Änderungssätze kopieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> @@ -19360,11 +19359,6 @@ <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> - <source>Resolve conflict</source> - <translation>Konflikt lösen</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> <source>Select all local file entries</source> <translation>Alle lokalen Dateieinträge auswählen</translation> @@ -19399,6 +19393,11 @@ <source>Do you really want to remove these files from the repository?</source> <translation>Wollen Sie wirklich diese Dateien vom Repository löschen?</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> + <source>Conflict resolved</source> + <translation>Konflikt gelöst</translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -19544,711 +19543,671 @@ </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> - <source>Add to repository</source> - <translation>Zum Repository hinzufügen</translation> + <source>Remove from repository (and disk)</source> + <translation>Vom Repository (und der Platte) löschen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> - <source>&Add to repository...</source> - <translation>Zum Repository &hinzufügen...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="225"/> - <source>Add the local project to the repository</source> - <translation>Fügt das lokale Projekt zum Repository hinzu</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228"/> - <source><b>Add to repository</b><p>This adds (imports) the local project to the repository.</p></source> - <translation><b>Zum Repository hinzufügen</b><p>Dies fügt das lokale Projekt zum Repository hinzu.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> - <source>Remove from repository (and disk)</source> - <translation>Vom Repository (und der Platte) löschen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> <source>&Remove from repository (and disk)</source> <translation>Vom Repository (und der Platte) &löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="239"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> <source>Remove the local project from the repository (and disk)</source> <translation>Löscht das lokale Projekt von dem Repository (und der Platte)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> <source><b>Remove from repository</b><p>This removes the local project from the repository (and disk).</p></source> <translation><b>Vom Repository löschen</b><p>Dies löscht das lokale Projekt vom Repository (und der Platte).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Show log</source> <translation>Beschreibungen anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Show &log</source> <translation>&Beschreibungen anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241"/> <source>Show the log of the local project</source> <translation>Zeigt die Änderungsbeschreibungen des lokalen Projektes an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="257"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="244"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Beschreibungen anzeigen</b><p>Dies zeigt die Änderungsbeschreibungen (Log) des lokalen Projektes an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>Show log browser</source> <translation>Zeige Log Browser</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="255"/> <source>Show a dialog to browse the log of the local project</source> <translation>Zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation><b>Zeige Log Browser</b><p>Dies zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen. Zunächst wird nur eine begrenzte Anzahl an Einträgen angezeigt. Weitere können später geholt werden.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> + <source>Show difference</source> + <translation>Unterschiede anzeigen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> + <source>Show &difference</source> + <translation>&Unterschiede anzeigen</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> - <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> - <translation><b>Zeige Log Browser</b><p>Dies zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen. Zunächst wird nur eine begrenzte Anzahl an Einträgen angezeigt. Weitere können später geholt werden.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> - <source>Show difference</source> - <translation>Unterschiede anzeigen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> - <source>Show &difference</source> - <translation>&Unterschiede anzeigen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> <source>Show the difference of the local project to the repository</source> <translation>Zeigt den Unterschied des lokalen Projektes zum Repository an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation><b>Unterschiede anzeigen</b><p>Dies zeigt den Unterschied des lokalen Projektes zum Repository an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> <source>Show difference (extended)</source> <translation>Unterschiede anzeigen (erweitert)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Zeigt den Unterschied von Revisionen des Projektes an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation><b>Unterschiede anzeigen (erweitert)</b><p>Dies zeigt den Unterschied von Revisionen des Projektes an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show status</source> <translation>Status anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show &status</source> <translation>Status an&zeigen</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> + <source>Show the status of the local project</source> + <translation>Zeige den Status des lokalen Projektes an</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation><b>Status anzeigen</b><p>Dies zeigt den Status des lokalen Projektes an.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <source>Show heads</source> + <translation>Köpfe anzeigen</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> - <source>Show the status of the local project</source> - <translation>Zeige den Status des lokalen Projektes an</translation> + <source>Show the heads of the repository</source> + <translation>Zeigt die Köpfe des Repository an</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation><b>Status anzeigen</b><p>Dies zeigt den Status des lokalen Projektes an.</p></translation> + <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> + <translation><b>Köpfe anzeigen</b><p>Dies zeigt die Köpfe des Repository an.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> - <source>Show heads</source> - <translation>Köpfe anzeigen</translation> + <source>Show parents</source> + <translation>Vorgänger anzeigen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> - <source>Show the heads of the repository</source> - <translation>Zeigt die Köpfe des Repository an</translation> + <source>Show the parents of the repository</source> + <translation>Zeigt die Vorgänger des repository an</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="328"/> - <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> - <translation><b>Köpfe anzeigen</b><p>Dies zeigt die Köpfe des Repository an.</p></translation> + <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> + <translation><b>Vorgänger anzeigen</b><p>Dies zeigt die Vorgänger des repository an.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> - <source>Show parents</source> - <translation>Vorgänger anzeigen</translation> + <source>Show tip</source> + <translation>Spitze (tip) anzeigen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> - <source>Show the parents of the repository</source> - <translation>Zeigt die Vorgänger des repository an</translation> + <source>Show the tip of the repository</source> + <translation>Zeigt die Spitze (tip) des Repository an</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="341"/> - <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> - <translation><b>Vorgänger anzeigen</b><p>Dies zeigt die Vorgänger des repository an.</p></translation> + <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> + <translation><b>Spitze (tip) anzeigen</b><p>Dies zeigt die Spitze (tip) des Repository an.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <source>Revert changes</source> + <translation>Änderungen rückgängig</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> - <source>Show tip</source> - <translation>Spitze (tip) anzeigen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="351"/> - <source>Show the tip of the repository</source> - <translation>Zeigt die Spitze (tip) des Repository an</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/> - <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> - <translation><b>Spitze (tip) anzeigen</b><p>Dies zeigt die Spitze (tip) des Repository an.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> - <source>Revert changes</source> - <translation>Änderungen rückgängig</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Re&vert changes</source> <translation>Änderungen &rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/> <source>Revert all changes made to the local project</source> <translation>Alle Änderungen am lokalen Projekt werden rückgängig gemacht</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Änderungen rückgängig</b><p>Dies macht alle Änderungen am lokalen Projekt werden rückgängig.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Merge</source> <translation>Änderungen einpflegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Mer&ge changes...</source> <translation>Änderungen ein&pflegen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> <source>Merge changes of a revision into the local project</source> <translation>Pflege Änderungen einer Revision in das lokale Projekt ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Änderungen einpflegen</b><p>Dies pfleget Änderungen einer Revision in das lokale Projekt ein.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> - <source>Resolve conflicts</source> - <translation>Konflikte lösen</translation> + <source>Tag in repository</source> + <translation>Im Repository markieren</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> - <source>Resolve con&flicts</source> - <translation>&Konflikte lösen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="392"/> - <source>Resolve all conflicts of the local project</source> - <translation>Löse alle Konflikte des lokalen Projektes</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> - <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> - <translation><b>Konflikte lösen</b><p>Dies löst alle Konflikte des lokalen Projektes.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> - <source>Tag in repository</source> - <translation>Im Repository markieren</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> <source>&Tag in repository...</source> <translation>Im Repository &markieren...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> + <source>Tag the local project in the repository</source> + <translation>Das lokale Projekt im Repository markieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Im Repository markieren</b><p>Dies markiert das lokale Projekt im Repository.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <source>List tags</source> + <translation>Marken listen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <source>List tags...</source> + <translation>Marken listen...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> - <source>Tag the local project in the repository</source> - <translation>Das lokale Projekt im Repository markieren</translation> + <source>List tags of the project</source> + <translation>Listet Marken des Projektes</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="409"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Im Repository markieren</b><p>Dies markiert das lokale Projekt im Repository.</p></translation> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Marken listen</b><p>Dies listet die Marken des Projektes.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>List tags</source> - <translation>Marken listen</translation> + <source>List branches</source> + <translation>Zweige listen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>List tags...</source> - <translation>Marken listen...</translation> + <source>List branches...</source> + <translation>Zweige listen...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> - <source>List tags of the project</source> - <translation>Listet Marken des Projektes</translation> + <source>List branches of the project</source> + <translation>Listet Zweige des Projektes</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>Marken listen</b><p>Dies listet die Marken des Projektes.</p></translation> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Zweige listen</b><p>Dies listet die Zweige des Projektes.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source>List branches</source> - <translation>Zweige listen</translation> + <source>Create branch</source> + <translation>Zweig erzeugen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source>List branches...</source> - <translation>Zweige listen...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/> - <source>List branches of the project</source> - <translation>Listet Zweige des Projektes</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Zweige listen</b><p>Dies listet die Zweige des Projektes.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> - <source>Create branch</source> - <translation>Zweig erzeugen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> <source>Create &branch...</source> <translation>&Zweig erzeugen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> <source>Create a new branch for the local project in the repository</source> <translation>Erzeuge einen neuen Zweig für das lokale Projekt im Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Zweig erzeugen</b><p>Dies erzeugt einen neuen Zweig für das lokale Projekt im Repository</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> <source>Close branch</source> <translation>Zweig abschließen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> <source>Close the current branch of the local project</source> <translation>Schließt den aktuellen Zweig des lokalen Projektes ab</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Zweig abschließen</b><p>Dies schließt den aktuellen Zweig des lokalen Projektes ab.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source>Switch</source> <translation>Umschalten</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source>S&witch...</source> <translation>Umschal&ten...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> + <source>Switch the working directory to another revision</source> + <translation>Schaltet das Arbeitsverzeichnis auf eine andere Revision um</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="491"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation><b>Umschalten</b><p>Dies schaltet das lokale Arbeitsverzeichnis auf eine andere Revision um.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <source>Cleanup</source> + <translation>Aufräumen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <source>Cleanu&p</source> + <translation>Au&fräumen</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> - <source>Switch the working directory to another revision</source> - <translation>Schaltet das Arbeitsverzeichnis auf eine andere Revision um</translation> + <source>Cleanup the local project</source> + <translation>Räume das lokale Projekt auf</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> - <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> - <translation><b>Umschalten</b><p>Dies schaltet das lokale Arbeitsverzeichnis auf eine andere Revision um.</p></translation> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Aufräumen</b><p>Dies räumt das lokale Projekt auf.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> - <source>Cleanup</source> - <translation>Aufräumen</translation> + <source>Execute command</source> + <translation>Befehl ausführen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> - <source>Cleanu&p</source> - <translation>Au&fräumen</translation> + <source>E&xecute command...</source> + <translation>Befehl ausf&ühren...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> - <source>Cleanup the local project</source> - <translation>Räume das lokale Projekt auf</translation> + <source>Execute an arbitrary Mercurial command</source> + <translation>Führe einen beliebigen Mercurial Befehl aus</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Aufräumen</b><p>Dies räumt das lokale Projekt auf.</p></translation> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> + <translation><b>Befehl ausführen</b><p>Dies öffnet einen Dialog zur Eingabe eines beliebeigen Mercurial Befehls.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> - <source>Execute command</source> - <translation>Befehl ausführen</translation> + <source>Command options</source> + <translation>Befehlsoptionen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> - <source>E&xecute command...</source> - <translation>Befehl ausf&ühren...</translation> + <source>Command &options...</source> + <translation>Befehls&optionen...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>Execute an arbitrary Mercurial command</source> - <translation>Führe einen beliebigen Mercurial Befehl aus</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> - <translation><b>Befehl ausführen</b><p>Dies öffnet einen Dialog zur Eingabe eines beliebeigen Mercurial Befehls.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> - <source>Command options</source> - <translation>Befehlsoptionen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> - <source>Command &options...</source> - <translation>Befehls&optionen...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>Show the Mercurial command options</source> <translation>Zeigt die Mercurial Befehlsoptionen</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> + <translation><b>Befehlsoptionen...</b><p>Dies öffnet einen Dialog zur Eingabe der Mercurial Befehlsoptionen.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Configure</source> + <translation>Einstellungen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Configure...</source> + <translation>Einstellungen...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <source>Show the configuration dialog with the Mercurial page selected</source> + <translation>Zeigt den Konfigurationsdialog mit ausgewählter Mercurial Seite</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> - <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> - <translation><b>Befehlsoptionen...</b><p>Dies öffnet einen Dialog zur Eingabe der Mercurial Befehlsoptionen.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> - <source>Configure</source> - <translation>Einstellungen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> - <source>Configure...</source> - <translation>Einstellungen...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> - <source>Show the configuration dialog with the Mercurial page selected</source> - <translation>Zeigt den Konfigurationsdialog mit ausgewählter Mercurial Seite</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Einstellungen</b><p>Zeigt den Konfigurationsdialog mit ausgewählter Mercurial Seite.</p></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <source>Show paths</source> + <translation>Pfade anzeigen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <source>Show paths...</source> + <translation>Pfade anzeigen...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <source>Show the aliases for remote repositories</source> + <translation>Zeigt die Namen für entfernte Repositories</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation><b>Pfade anzeigen</b><p>Dies zeigt die Namen für entfernte Repositories.</p<</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> - <source>Show paths</source> - <translation>Pfade anzeigen</translation> + <source>Verify repository</source> + <translation>Repository verifizieren</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> - <source>Show paths...</source> - <translation>Pfade anzeigen...</translation> + <source>Verify repository...</source> + <translation>Repository verifizieren...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> - <source>Show the aliases for remote repositories</source> - <translation>Zeigt die Namen für entfernte Repositories</translation> + <source>Verify the integrity of the repository</source> + <translation>Verfiziert die Integrität des Repository</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation><b>Pfade anzeigen</b><p>Dies zeigt die Namen für entfernte Repositories.</p<</translation> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation><b>Repository verifizieren</b><p>Dies verfiziert die Integrität des Repository.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Verify repository</source> - <translation>Repository verifizieren</translation> + <source>Recover</source> + <translation>Transaktion zurücksetzen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Verify repository...</source> - <translation>Repository verifizieren...</translation> + <source>Recover...</source> + <translation>Transaktion zurücksetzen...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> - <source>Verify the integrity of the repository</source> - <translation>Verfiziert die Integrität des Repository</translation> + <source>Recover from an interrupted transaction</source> + <translation>Setzt eine abgebrochene Transaktion zurück</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> - <translation><b>Repository verifizieren</b><p>Dies verfiziert die Integrität des Repository.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> - <source>Recover</source> - <translation>Transaktion zurücksetzen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> - <source>Recover...</source> - <translation>Transaktion zurücksetzen...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> - <source>Recover from an interrupted transaction</source> - <translation>Setzt eine abgebrochene Transaktion zurück</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Transaktion zurücksetzen</b><p>Dies setzt eine abgebrochene Transaktion zurück.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Repository Administration</source> <translation>Repository Administration</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <source>Create .hgignore</source> + <translation>Erstelle .hgignore</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <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="647"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation><b>Erstelle .hgignore</b><p>Dies erstellt eine .hgignore Datei mit Standardwerten.</p></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> - <source>Create .hgignore</source> - <translation>Erstelle .hgignore</translation> + <source>Create changegroup</source> + <translation>Änderungsgruppe erzeugen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <source>Create changegroup...</source> + <translation>Änderungsgruppe erzeugen...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> - <source>Create a .hgignore file with default values</source> - <translation>Erstelle eine .hgignore Datei mit Standardwerten</translation> + <source>Create changegroup file collecting changesets</source> + <translation>Erzeuge eine Änderungsgruppendatei für Änderungssätze</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> + <source>Apply changegroups</source> + <translation>Änderungsgruppen anwenden</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <source>Apply changegroups...</source> + <translation>Änderungsgruppen anwenden...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> + <source>Apply one or several changegroup files</source> + <translation>Wende eine oder mehrere Änderungsgruppendateien an</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> + <source>Changegroup Management</source> + <translation>Verwaltung von Änderungsgruppen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation><b>Erstelle .hgignore</b><p>Dies erstellt eine .hgignore Datei mit Standardwerten.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Create changegroup</source> - <translation>Änderungsgruppe erzeugen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Create changegroup...</source> - <translation>Änderungsgruppe erzeugen...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> - <source>Create changegroup file collecting changesets</source> - <translation>Erzeuge eine Änderungsgruppendatei für Änderungssätze</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> - <source>Apply changegroups</source> - <translation>Änderungsgruppen anwenden</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> - <source>Apply changegroups...</source> - <translation>Änderungsgruppen anwenden...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> - <source>Apply one or several changegroup files</source> - <translation>Wende eine oder mehrere Änderungsgruppendateien an</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> - <source>Changegroup Management</source> - <translation>Verwaltung von Änderungsgruppen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Änderungsgruppe erzeugen</b><p>Dies erzeuge eine Änderungsgruppendatei für ausgewählte Änderungssätze (hg bundle).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Änderungsgruppen anwenden</b><p>Dies wendet eine oder mehrere mit 'Änderungsgruppe erzeugen' erstellte Änderungsgruppendateien an (hg unbundle).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source>Show current branch</source> <translation>Zeige aktuellen Zweig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> <source>Show the current branch of the project</source> <translation>Zeigt den aktuellen Zweig des Projektes</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Zeige aktuellen Zweig</b><p>Dies zeigt den aktuellen Zweig des Projektes.</p></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Mark as "good"</source> + <translation>Als "gut" markieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <source>Mark a selectable changeset as good</source> + <translation>Markiere einen auswählbaren Änderungssatz als gut</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation><b>Als gut markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als gut.</p></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> - <source>Mark as "good"</source> - <translation>Als "gut" markieren</translation> + <source>Mark as "bad"</source> + <translation>Als "schlecht" markieren</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> - <source>Mark a selectable changeset as good</source> - <translation>Markiere einen auswählbaren Änderungssatz als gut</translation> + <source>Mark a selectable changeset as bad</source> + <translation>Markiere einen auswählbaren Änderungssatz als schlecht</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation><b>Als gut markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als gut.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Mark as "bad"</source> - <translation>Als "schlecht" markieren</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> - <source>Mark a selectable changeset as bad</source> - <translation>Markiere einen auswählbaren Änderungssatz als schlecht</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Als schlecht markieren</b><p>Dies markiert einen auswählbaren Änderungssatz als schlecht.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> - <source>Skip</source> - <translation>Überspringen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> - <source>Reset</source> - <translation>Zurücksetzen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> - <source>Reset the bisect search data</source> - <translation>Setzt die Bisect Suchdaten zurück</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> - <translation><b>Zurücksetzen</b><p>Dies setzt die Bisect Suchdaten zurück.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> - <source>Bisect</source> - <translation>Bisect</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> - <source>Mark as "good"...</source> - <translation>Als "gut" markieren...</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> + <source>Skip</source> + <translation>Überspringen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <source>Reset</source> + <translation>Zurücksetzen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <source>Reset the bisect search data</source> + <translation>Setzt die Bisect Suchdaten zurück</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> + <translation><b>Zurücksetzen</b><p>Dies setzt die Bisect Suchdaten zurück.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <source>Bisect</source> + <translation>Bisect</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Mark as "good"...</source> + <translation>Als "gut" markieren...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "bad"...</source> <translation>Als "schlecht" markieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Preview changegroup</source> <translation>Änderungsgruppe ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Preview changegroup...</source> <translation>Änderungsgruppe ansehen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Identify</source> <translation>Identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Identify...</source> <translation>Identifizieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> <source>Identify the project directory</source> <translation>Identifiziere das Projektverzeichnis</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identifizieren</b><p>Dies identifiziert das Projektverzeichnis.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="671"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Eine Änderungsgruppendatei für Änderungssätze ansehen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Änderungsgruppe ansehen</b><p>Dies zeigt den Inhalt einer Änderungsgruppendatei für Änderungssätze an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Identify changegroup</source> <translation>Änderungsgruppe identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Identify changegroup...</source> <translation>Änderungsgruppe identifizieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation>Eine Änderungsgruppendatei für Änderungssätze identifizieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation><b>Änderungsgruppe ansehen</b><p>Dies identifiziert eine Änderungsgruppendatei für Änderungssätze.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Back out changeset</source> <translation>Änderungssatz umkehren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Back out changes of an earlier changeset</source> <translation>Änderungen eines früheren Änderungssatzes umkehren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Änderungssatz umkehren</b><p>Dies kehrt die Änderungen eines früheren Änderungssatzes um.</p></translation> </message> @@ -20268,260 +20227,280 @@ <translation><b>Änderungen hochladen (force)</b><p>Dies lädt Änderungen vom lokalen Repository an ein entferntes Repository mit der Option 'force' hoch.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> <source>Specials</source> <translation>Spezialfunktionen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Serve project repository</source> <translation>Server für Projektrepository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Serve project repository...</source> <translation>Server für Projektrepository...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/> <source>Serve the project repository</source> <translation>Server für das Projektrepository bereitstellen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Server für Projektrepository<b><p>Dies stellt einen Server für das Projektrepository zur Verfügung.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> <source>The project should be reread. Do this now?</source> <translation>Das Projekt sollte neu gelesen werde. Jetzt durchführen?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> <source>Push new branch</source> <translation>Neuen Zweig hochladen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> <source>Push the current branch of the local project as a new named branch</source> <translation>Lade den aktuellen Zweig als neuen benannten Zweig hoch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation><b>Neuen Zweig hochladen</b><p>Dies lädt den aktuellen Zweig als neuen benannten Zweig hoch.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Rollback last transaction</source> <translation>Letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source>Rollback the last transaction</source> <translation>Die letzte Transaktion zurücksetzen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care.</strong></p></source> <translation><b>Letzte Transaktion zurücksetzen</b><p>Dies setzt die letzte Transaktion zurück. Transaktionen werden verwendet, um die Effekte aller Befehle, die neue Änderungssätze erzeugen oder vorhandene Änderungssätze in das Repository propagieren, zu kapseln. So arbeiten z.B. die folgenden Befehle transaktional und ihre Effekte können zurückgesetzt werden:<ul><li>commit</li><li>import</li><li>pull</li><li>push (mit diesem repository als Ziel)</li><li>unbundle</li></ul></p><p><strong>Dieser Befehl kann gefährlich sein. Bitte mit Vorsicht verwenden.</strong></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> <source>Extensions</source> <translation>Erweiterungen</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source>Edit user configuration</source> + <translation>Nutzerkonfiguration editieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source>Edit user configuration...</source> + <translation>Nutzerkonfiguration editieren...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> + <source>Show an editor to edit the user configuration file</source> + <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation><b>Nutzerkonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers.</p></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit user configuration</source> - <translation>Nutzerkonfiguration editieren</translation> + <source>Edit repository configuration</source> + <translation>Repositorykonfiguration editieren</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit user configuration...</source> - <translation>Nutzerkonfiguration editieren...</translation> + <source>Edit repository configuration...</source> + <translation>Repositorykonfiguration editieren...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> - <source>Show an editor to edit the user configuration file</source> - <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers</translation> + <source>Show an editor to edit the repository configuration file</source> + <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation><b>Nutzerkonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Nutzers.</p></translation> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation><b>Repositorykonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Edit repository configuration</source> - <translation>Repositorykonfiguration editieren</translation> + <source>Show combined configuration settings</source> + <translation>Zeige kombinierte Einstellungen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Edit repository configuration...</source> - <translation>Repositorykonfiguration editieren...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> - <source>Show an editor to edit the repository configuration file</source> - <translation>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation><b>Repositorykonfiguration editieren</b><p>Zeigt einen Editor zum Bearbeiten der Konfigurationsdatei des Repository.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> - <source>Show combined configuration settings</source> - <translation>Zeige kombinierte Einstellungen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> <source>Show combined configuration settings...</source> <translation>Zeige kombinierte Einstellungen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="578"/> <source>Show the combined configuration settings from all configuration files</source> <translation>Zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation><b>Zeige kombinierte Einstellungen</b><p>Dies zeigt die kombinierten Einstellungen aus allen Konfigurationsdateien.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Skip...</source> <translation>Überspringen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Skip a selectable changeset</source> <translation>Überspringe einen auswählbaren Änderungssatz</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation><b>Überspringen</b><p>Dies überspringt einen auswählbaren Änderungssatz.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1311"/> <source>Import Patch</source> <translation>Patch importieren</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <source>Import Patch...</source> + <translation>Patch importieren...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> + <source>Import a patch from a patch file</source> + <translation>Einen Patch aus einer Patchdatei importieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation><b>Patch importieren</b><p>Dies importiert einen Patch aus einer Patchdatei in das Projekt.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/> + <source>Patch Management</source> + <translation>Verwaltung von Patches</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <source>Revert Changes</source> + <translation>Änderungen rückgängig machen</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Import Patch...</source> - <translation>Patch importieren...</translation> + <source>Export Patches</source> + <translation>Patches exportieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <source>Export Patches...</source> + <translation>Patches exportieren...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> - <source>Import a patch from a patch file</source> - <translation>Einen Patch aus einer Patchdatei importieren</translation> + <source>Export revisions to patch files</source> + <translation>Änderungssätze in Patchdateien exportieren</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> - <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> - <translation><b>Patch importieren</b><p>Dies importiert einen Patch aus einer Patchdatei in das Projekt.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> - <source>Patch Management</source> - <translation>Verwaltung von Patches</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344"/> - <source>Revert Changes</source> - <translation>Änderungen rückgängig machen</translation> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation><b>Patches exportieren</b><p>Dies exportiert Änderungssätze des projektes in Patchdateien.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> - <source>Export Patches</source> - <translation>Patches exportieren</translation> + <source>Change Phase</source> + <translation>Phase ändern</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> - <source>Export Patches...</source> - <translation>Patches exportieren...</translation> + <source>Change Phase...</source> + <translation>Phase ändern...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/> - <source>Export revisions to patch files</source> - <translation>Änderungssätze in Patchdateien exportieren</translation> + <source>Change the phase of revisions</source> + <translation>Ändert die Phase von Revisionen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation><b>Patches exportieren</b><p>Dies exportiert Änderungssätze des projektes in Patchdateien.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> - <source>Change Phase</source> - <translation>Phase ändern</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> - <source>Change Phase...</source> - <translation>Phase ändern...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> - <source>Change the phase of revisions</source> - <translation>Ändert die Phase von Revisionen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation><b>Phase ändern</b><p>Dies ändert die Phase von Revisionen.</p></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1349"/> + <source>Copy Changesets</source> + <translation>Änderungssätze kopieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856"/> + <source>Copies changesets from another branch</source> + <translation>Änderungssätze aus einem anderen Zweig kopieren</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> + <translation><b>Änderungssätze kopieren</b><p>Dies kopiert Änderungssätze aus einem anderen Zweig mit dem Nutzernamen, der Datums und der Änderungsmeldung des Originaländerungssatzes in das Arbeitsverzeichnis.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <source>Continue Copying Session</source> + <translation>Kopiersitzung fortsetzen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation>Setzt die letzte Kopiersitzung nach Lösung von Konflikten fort</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation><b>Kopiersitzung fortsetzen</b><p>Dies setzt die letzte Kopiersitzung nach Lösung von Konflikten fort.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> + <source>Graft</source> + <translation>Graft</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> - <source>Copy Changesets</source> - <translation>Änderungssätze kopieren</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> - <source>Copies changesets from another branch</source> - <translation>Änderungssätze aus einem anderen Zweig kopieren</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> - <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> - <translation><b>Änderungssätze kopieren</b><p>Dies kopiert Änderungssätze aus einem anderen Zweig mit dem Nutzernamen, der Datums und der Änderungsmeldung des Originaländerungssatzes in das Arbeitsverzeichnis.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> - <source>Continue Copying Session</source> - <translation>Kopiersitzung fortsetzen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation>Setzt die letzte Kopiersitzung nach Lösung von Konflikten fort</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation><b>Kopiersitzung fortsetzen</b><p>Dies setzt die letzte Kopiersitzung nach Lösung von Konflikten fort.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> - <source>Graft</source> - <translation>Graft</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> <source>Copy Changesets (Continue)</source> <translation>Änderungssätze kopieren (Fortsetzung)</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <source>Conflicts resolved</source> + <translation>Konflikte gelöst</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <source>Con&flicts resolved</source> + <translation>&Konflikte gelöst</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation>Markiert alle Konflikte des lokalen Projektes als gelöst</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation><b>Konflikte gelöst</b><p>Dies markiert alle Konflikte des lokalen Projektes als gelöst.</p></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -29191,7 +29170,7 @@ <translation><b>Quelltext Abdeckung...</b><p>Dies zeigt die Quelltextabdeckung für alle Python Dateien des Projektes an.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3901"/> + <location filename="Project/Project.py" line="3903"/> <source>Profile Data</source> <translation>Profildaten</translation> </message> @@ -29216,12 +29195,12 @@ <translation>&Zeige</translation> </message> <message> - <location filename="Project/Project.py" line="3880"/> + <location filename="Project/Project.py" line="3882"/> <source>There is no main script defined for the current project. Aborting</source> <translation>Für das aktuelle Projekt ist kein Hauptskript festgelegt. Abbruch</translation> </message> <message> - <location filename="Project/Project.py" line="3834"/> + <location filename="Project/Project.py" line="3836"/> <source>Coverage Data</source> <translation>Quelltext Abdeckungsdaten</translation> </message> @@ -29231,7 +29210,7 @@ <translation>&Versionskontrolle</translation> </message> <message> - <location filename="Project/Project.py" line="3954"/> + <location filename="Project/Project.py" line="3956"/> <source>Application Diagram</source> <translation>Applikations-Diagramm</translation> </message> @@ -29261,17 +29240,17 @@ <translation>Projektdatei speichern</translation> </message> <message> - <location filename="Project/Project.py" line="3855"/> + <location filename="Project/Project.py" line="3857"/> <source>Code Coverage</source> <translation>Quelltext Abdeckung</translation> </message> <message> - <location filename="Project/Project.py" line="3855"/> + <location filename="Project/Project.py" line="3857"/> <source>Please select a coverage file</source> <translation>Bitte wählen sie eine Datei mit Abdeckungsdaten</translation> </message> <message> - <location filename="Project/Project.py" line="3901"/> + <location filename="Project/Project.py" line="3903"/> <source>Please select a profile file</source> <translation>Bitte wählen sie eine Datei mit Profildaten</translation> </message> @@ -29416,7 +29395,7 @@ <translation>Sonstige</translation> </message> <message> - <location filename="Project/Project.py" line="3954"/> + <location filename="Project/Project.py" line="3956"/> <source>Include module names?</source> <translation>Modulnamen anzeigen?</translation> </message> @@ -29724,7 +29703,7 @@ </translation> </message> <message> - <location filename="Project/Project.py" line="4085"/> + <location filename="Project/Project.py" line="4087"/> <source>Create Package List</source> <translation>Erzeuge Paketliste</translation> </message> @@ -29734,7 +29713,7 @@ <translation>Erzeuge &Paketliste</translation> </message> <message> - <location filename="Project/Project.py" line="4245"/> + <location filename="Project/Project.py" line="4247"/> <source>Create Plugin Archive</source> <translation>Erzeuge Plugin Archiv</translation> </message> @@ -29744,27 +29723,27 @@ <translation>Erzeuge Plugin &Archiv</translation> </message> <message> - <location filename="Project/Project.py" line="4058"/> + <location filename="Project/Project.py" line="4060"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation><p>Die Datei <b>PKGLIST</b> existiert bereits.</p><p>Überschreiben?</p></translation> </message> <message> - <location filename="Project/Project.py" line="4085"/> + <location filename="Project/Project.py" line="4087"/> <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> <translation><p>Die Datei <b>PKGLIST</b> konnte nicht erzeugt werden.</p><p>Ursache: {0}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4102"/> + <location filename="Project/Project.py" line="4104"/> <source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source> <translation><p>Die Datei <b>PKGLIST</b> existiert nicht. Abbruch...</p></translation> </message> <message> - <location filename="Project/Project.py" line="4110"/> + <location filename="Project/Project.py" line="4112"/> <source>The project does not have a main script defined. Aborting...</source> <translation>Für das Projekt wurde kein Hauptskript angegeben. Abbruch...</translation> </message> <message> - <location filename="Project/Project.py" line="4122"/> + <location filename="Project/Project.py" line="4124"/> <source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source> <translation><p>Die Datei <b>PKGLIST</b> konnte nicht gelesen werden.</p><p>Ursache: {0}</p></translation> </message> @@ -29794,7 +29773,7 @@ <translation><p>Der Projekttyp <b>{0}</b> existiert bereits.</p></translation> </message> <message> - <location filename="Project/Project.py" line="4153"/> + <location filename="Project/Project.py" line="4155"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation><p>Die Datei <b>{0}</b> konnte nicht im Archiv gespeichert werde. Sie wird ignoriert.</p><p>Ursache: {1}</p></translation> </message> @@ -29809,7 +29788,7 @@ <translation>Erzeuge Plugin Archiv (&Snapshot)</translation> </message> <message> - <location filename="Project/Project.py" line="4245"/> + <location filename="Project/Project.py" line="4247"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation><p>Die Plugindatei <b>{0}</b> konnte nicht gelesen werden.<br>Grund: {1}</p></translation> </message> @@ -29909,12 +29888,12 @@ <translation><b>Erzeuge Plugin Archiv (Snapshot)</b><p>Dies erzeugt eine eric5 Plugin Archivdatei mit den Dateien, die in der PKGLIST Datei angegeben wurden. Der Archivname wird aus dem Namen des Hauptskriptes generiert. Der Versionseintrag des Hauptskriptes wird verändert, um ein Snapshot Release anzuzeigen.</p></translation> </message> <message> - <location filename="Project/Project.py" line="4133"/> + <location filename="Project/Project.py" line="4135"/> <source><p>The eric5 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation><p>Die eric5 Plugin Archivdatei <b>{0}</b> konnte nicht erzeugt werden.</p><p>Ursache: {1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4165"/> + <location filename="Project/Project.py" line="4167"/> <source><p>The eric5 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation><p>Die eric5 Plugin Archivdatei <b>{0}</b> wurde erfolgreich erzeugt.</p></translation> </message> @@ -38133,224 +38112,224 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="314"/> <source>Importing project into Subversion repository</source> <translation>Lade das Projekt in das Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="363"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="364"/> <source>Subversion Checkout</source> <translation>Subversion Checkout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="385"/> <source>Checking project out of Subversion repository</source> <translation>Lade das Projekt aus dem Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="445"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="446"/> <source>Exporting project from Subversion repository</source> <translation>Expotiere das Projekt aus dem Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> <source>Subversion Error</source> <translation>Subversion Fehler</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="986"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="987"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>Die URL des Projektrepositories konnte nicht aus der Arbeitskopie ermittelt werden. Die Tag Operation wird abgebrochen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1010"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1011"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>Die URL des Projektrepositories hat ein ungültiges Format. Die Tag Operation wird abgebrochen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> <source>Tagging {0} in the Subversion repository</source> <translation>Markiere {0} im Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1101"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1102"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>Die URL des Projektrepositories konnte nicht aus der Arbeitskopie ermittelt werden. Die Umschaltoperation wird abgebrochen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>Die URL des Projektrepositories hat ein ungültiges Format. Die Umschaltoperation wird abgebrochen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1148"/> <source>Switching to {0}</source> <translation>Schalte {0} um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1249"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1250"/> <source>Merging {0}</source> <translation>Arbeite Änderungen in {0} ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1512"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1527"/> <source>Cleaning up {0}</source> <translation>Räume {0} auf</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1548"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Subversion command</source> <translation>Subversion Befehl</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1694"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1709"/> <source>Copying {0}</source> <translation>Kopiere {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="882"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="883"/> <source>Moving {0}</source> <translation>Verschiebe {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>Das Tag muß ein normales Tag (tags) oder ein Zweigtag (branches) sein. Bitte aus der Liste auswählen.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> <source>Subversion Export</source> <translation>Subversion Export</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1776"/> <source>Subversion Set Property</source> <translation>Subversion Eigenschaft definieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1794"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1809"/> <source>You have to supply a property name. Aborting.</source> <translation>Sie müssen einen Namen für die Eigenschaft angeben. Abbruch.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1812"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> <source>Subversion Delete Property</source> <translation>Subversion Eigenschaft löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1632"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1647"/> <source>Enter property name</source> <translation>Gib den Namen der Eigenschaft ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="530"/> <source>Commiting changes to Subversion repository</source> <translation>Pflege Änderungen in das Subversion Repository ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="585"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="586"/> <source>Synchronizing with the Subversion repository</source> <translation>Gleiche mit dem Subversion Repository ab</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="686"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="687"/> <source>Adding files/directories to the Subversion repository</source> <translation>Füge Dateien/Verzeichnisse dem Subversion Repository hinzu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="785"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="786"/> <source>Adding directory trees to the Subversion repository</source> <translation>Füge Verzeichnisbäume dem Subversion Repository hinzu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="820"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> <source>Removing files/directories from the Subversion repository</source> <translation>Lösche Dateien/Verzeichnisse aus dem Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1074"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1075"/> <source>Reverting changes</source> <translation>Mache Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1655"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1670"/> <source>Resolving conficts</source> <translation>Löse Konflikte</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="221"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> <source>Create project in repository</source> <translation>Projekt im Repository anlegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="221"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>Das Projekt konnte nicht im Repository angelegt werden. Vielleicht existiert das angegebene Repository nicht oder der Repository-Server ist nicht verfügbar.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> <source>New project</source> <translation>Neues Projekt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>Das Projekt konnte nicht aus dem Repository geladen werden.<br />Stelle das Original wieder her.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="922"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> <source>Subversion Log</source> <translation>Subversion Log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="922"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> <source>Select number of entries to show.</source> <translation>Wähle Anzahl der anzuzeigenden Einträge.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1978"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1993"/> <source>Locking in the Subversion repository</source> <translation>Sperren im Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2016"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2031"/> <source>Unlocking in the Subversion repository</source> <translation>Entsperren im Subversion Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="554"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="555"/> <source>Committed revision {0}.</source> <translation>Revision {0} eingepflegt.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1154"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> <source>Revision {0}. </source> <translation>Revision {0}. </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1792"/> <source>Property set.</source> <translation>Eigenschaft definiert.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1842"/> <source>Property deleted.</source> <translation>Eigenschaft gelöscht.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1958"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> <source>Subversion Lock</source> <translation>Subversion Sperre</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1958"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> <source>Enter lock comment</source> <translation>Gib eine Kommentar für die Sperre ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2076"/> <source>Relocating</source> <translation>Relozierung</translation> </message> @@ -38505,49 +38484,49 @@ <translation>unversioniert</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="329"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="330"/> <source>Imported revision {0}. </source> <translation>Revision {0} importiert. </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> <source>The svn process finished with the exit code {0}</source> <translation>Der svn Prozess endete mit dem Code {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="195"/> <source>The svn process did not finish within 30s.</source> <translation>Der svn Prozess endete nicht innerhalb von 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="196"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="197"/> <source>Could not start the svn executable.</source> <translation>Das svn Programm konnte nicht gestartet werden.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> <source>Repository Browser</source> <translation>Repository Browser</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> <source>Enter the repository URL.</source> <translation>Gib die URL des Repository ein.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2111"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2126"/> <source>Remove from changelist</source> <translation>Von Änderungsliste entfernen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2162"/> <source>Add to changelist</source> <translation>Zu Änderungsliste hinzufügen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2137"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2152"/> <source>Enter name of the changelist:</source> <translation>Gib deb Namen der Änderungsliste ein:</translation> </message> @@ -40100,11 +40079,6 @@ <translation>Änderungen einarbeiten</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> - <source>Resolve conflict</source> - <translation>Konflikt lösen</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="636"/> <source>Set Property</source> <translation>Eigenschaft definieren</translation> @@ -40199,6 +40173,11 @@ <source>Remove from Changelist</source> <translation>Von Änderungsliste entfernen</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> + <source>Conflict resolved</source> + <translation>Konflikt gelöst</translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -40264,524 +40243,504 @@ </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> - <source>Add to repository</source> - <translation>Zum Repository hinzufügen</translation> + <source>Remove from repository (and disk)</source> + <translation>Vom Repository (und der Platte) löschen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> - <source>&Add to repository...</source> - <translation>Zum Repository &hinzufügen...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="92"/> - <source>Add the local project to the VCS repository</source> - <translation>Fügt das lokale Projekt zum VCS Repository hinzu</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="95"/> - <source><b>Add to repository</b><p>This adds (imports) the local project to the VCS repository.</p></source> - <translation><b>Zum Repository hinzufügen</b><p>Dies fügt das lokale Projekt zum VCS Repository hinzu (Import).</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="102"/> - <source>Remove from repository (and disk)</source> - <translation>Vom Repository (und der Platte) löschen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="102"/> <source>&Remove from repository (and disk)</source> <translation>Vom Repository (und der Platte) &löschen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="93"/> <source>Remove the local project from the VCS repository (and disk)</source> <translation>Löscht das lokale Projekt von dem VCS Repository (und der Platte)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="109"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="96"/> <source><b>Remove from repository</b><p>This removes the local project from the VCS repository (and disk).</p></source> <translation><b>Vom Repository löschen</b><p>Dies löscht das lokale Projekt vom VCS Repository (und der Platte).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> <source>Show log</source> <translation>Beschreibungen anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> <source>Show &log</source> <translation>&Beschreibungen anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="121"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="108"/> <source>Show the log of the local project</source> <translation>Zeigt die Änderungsbeschreibungen des lokalen Projektes an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="124"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="111"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Beschreibungen anzeigen</b><p>Dies zeigt die Änderungsbeschreibungen (Log) des lokalen Projektes an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/> <source>Show difference</source> <translation>Unterschiede anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/> <source>Show &difference</source> <translation>&Unterschiede anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/> <source>Show the difference of the local project to the repository</source> <translation>Zeigt den Unterschied des lokalen Projektes zum Repository an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="141"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation><b>Unterschiede anzeigen</b><p>Dies zeigt den Unterschied des lokalen Projektes zum Repository an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="161"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="148"/> <source>Show difference (extended)</source> <translation>Unterschiede anzeigen (erweitert)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Zeigt den Unterschied von Revisionen des Projektes an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="155"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation><b>Unterschiede anzeigen (erweitert)</b><p>Dies zeigt den Unterschied von Revisionen des Projektes an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="177"/> <source>Show status</source> <translation>Status anzeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="177"/> <source>Show &status</source> <translation>Status an&zeigen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="181"/> <source>Show the status of the local project</source> <translation>Zeige den Status des lokalen Projektes an</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Status anzeigen</b><p>Dies zeigt den Status des lokalen Projektes an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>Tag in repository</source> <translation>Im Repository markieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>&Tag in repository...</source> <translation>Im Repository &markieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> <source>Tag the local project in the repository</source> <translation>Das lokale Projekt im Repository markieren</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Im Repository markieren</b><p>Dies markiert das lokale Projekt im Repository.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> <source>Export from repository</source> <translation>Export aus Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> <source>&Export from repository...</source> <translation>&Export aus Repository...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="224"/> + <source>Export a project from the repository</source> + <translation>Exportiert ein Projekt aus dem Repository</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="227"/> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>Export aus Repository</b<<p>Dies exportiert ein Projekt aus dem Repository.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <source>Command options</source> + <translation>Befehlsoptionen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <source>Command &options...</source> + <translation>Befehls&optionen...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> - <source>Export a project from the repository</source> - <translation>Exportiert ein Projekt aus dem Repository</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="240"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation><b>Export aus Repository</b<<p>Dies exportiert ein Projekt aus dem Repository.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> - <source>Command options</source> - <translation>Befehlsoptionen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> - <source>Command &options...</source> - <translation>Befehls&optionen...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="250"/> <source>Show the VCS command options</source> <translation>Zeigt die VCS Befehlsoptionen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="251"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> <translation><b>Befehlsoptionen...</b><p>Dies öffnet einen Dialog zur Eingabe der VCS Befehlsoptionen.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Revert changes</source> <translation>Änderungen rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Re&vert changes</source> <translation>Änderungen &rückgängig</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> <source>Revert all changes made to the local project</source> <translation>Alle Änderungen am lokalen Projekt werden rückgängig gemacht</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="265"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Änderungen rückgängig</b><p>Dies macht alle Änderungen am lokalen Projekt werden rückgängig.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> <source>Merge</source> <translation>Änderungen einpflegen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> <source>Mer&ge changes...</source> <translation>Änderungen ein&pflegen...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="263"/> <source>Merge changes of a tag/revision into the local project</source> <translation>Pflege Änderungen eines Tags/Zweiges in das lokale Projekt ein</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="279"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Änderungen einpflegen</b><p>Dies pfleget Änderungen eines Tags/Zweiges in das lokale Projekt ein.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> <source>Switch</source> <translation>Umschalten</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> <source>S&witch...</source> <translation>Umschal&ten...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> <source>Switch the local copy to another tag/branch</source> <translation>Schalte die lokale Kopie auf ein anderes Tag/anderen Zweig um</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>Umschalten</b><p>Dies schaltet die lokale Kopie auf ein anderes Tag/anderen Zweig um.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>Resolve conflicts</source> - <translation>Konflikte lösen</translation> + <source>Cleanup</source> + <translation>Aufräumen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>Resolve con&flicts</source> - <translation>&Konflikte lösen</translation> + <source>Cleanu&p</source> + <translation>Au&fräumen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> - <source>Resolve all conflicts of the local project</source> - <translation>Löse alle Konflikte des lokalen Projektes</translation> + <source>Cleanup the local project</source> + <translation>Räume das lokale Projekt auf</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> - <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> - <translation><b>Konflikte lösen</b><p>Dies löst alle Konflikte des lokalen Projektes.</p></translation> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Aufräumen</b><p>Dies räumt das lokale Projekt auf.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> - <source>Cleanup</source> - <translation>Aufräumen</translation> + <source>Execute command</source> + <translation>Befehl ausführen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> - <source>Cleanu&p</source> - <translation>Au&fräumen</translation> + <source>E&xecute command...</source> + <translation>Befehl ausf&ühren...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> - <source>Cleanup the local project</source> - <translation>Räume das lokale Projekt auf</translation> + <source>Execute an arbitrary VCS command</source> + <translation>Führe einen beliebigen VCS Befehl aus</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Aufräumen</b><p>Dies räumt das lokale Projekt auf.</p></translation> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> + <translation><b>Befehl ausführen</b><p>Dies öffnet einen Dialog zur Eingabe eines beliebeigen VCS Befehls.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> - <source>Execute command</source> - <translation>Befehl ausführen</translation> + <source>List tags</source> + <translation>Marken listen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> - <source>E&xecute command...</source> - <translation>Befehl ausf&ühren...</translation> + <source>List tags...</source> + <translation>Marken listen...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> - <source>Execute an arbitrary VCS command</source> - <translation>Führe einen beliebigen VCS Befehl aus</translation> + <source>List tags of the project</source> + <translation>Listet Marken des Projektes</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> - <translation><b>Befehl ausführen</b><p>Dies öffnet einen Dialog zur Eingabe eines beliebeigen VCS Befehls.</p></translation> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Marken listen</b><p>Dies listet die Marken des Projektes.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> - <source>List tags</source> - <translation>Marken listen</translation> + <source>List branches</source> + <translation>Zweige listen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> - <source>List tags...</source> - <translation>Marken listen...</translation> + <source>List branches...</source> + <translation>Zweige listen...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> - <source>List tags of the project</source> - <translation>Listet Marken des Projektes</translation> + <source>List branches of the project</source> + <translation>Listet Zweige des Projektes</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>Marken listen</b><p>Dies listet die Marken des Projektes.</p></translation> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Zweige listen</b><p>Dies listet die Zweige des Projektes.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> - <source>List branches</source> - <translation>Zweige listen</translation> + <source>List repository contents</source> + <translation>Repository Inhalt listen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> - <source>List branches...</source> - <translation>Zweige listen...</translation> + <source>List repository contents...</source> + <translation>Repository Inhalt listen...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> - <source>List branches of the project</source> - <translation>Listet Zweige des Projektes</translation> + <source>Lists the contents of the repository</source> + <translation>Listet den Inhalt des Repositories</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Zweige listen</b><p>Dies listet die Zweige des Projektes.</p></translation> + <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> + <translation><b>Repository Inhalt listen</b><p>Dies listet den Inhalt des Repositories.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> - <source>List repository contents</source> - <translation>Repository Inhalt listen</translation> + <source>Set Property</source> + <translation>Eigenschaft definieren</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> - <source>List repository contents...</source> - <translation>Repository Inhalt listen...</translation> + <source>Set Property...</source> + <translation>Eigenschaft definieren...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> - <source>Lists the contents of the repository</source> - <translation>Listet den Inhalt des Repositories</translation> + <source>Set a property for the project files</source> + <translation>Definiert eine Eigenschaft für alle Projektdateien</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> - <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> - <translation><b>Repository Inhalt listen</b><p>Dies listet den Inhalt des Repositories.</p></translation> + <source><b>Set Property</b><p>This sets a property for the project files.</p></source> + <translation><b>Eigenschaft definieren</b><p>Dies definiert eine Eigenschaft für alle Projektdateien.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> - <source>Set Property</source> - <translation>Eigenschaft definieren</translation> + <source>List Properties</source> + <translation>Eigenschaften listen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> - <source>Set Property...</source> - <translation>Eigenschaft definieren...</translation> + <source>List Properties...</source> + <translation>Eigenschaften listen...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> - <source>Set a property for the project files</source> - <translation>Definiert eine Eigenschaft für alle Projektdateien</translation> + <source>List properties of the project files</source> + <translation>Listet Eigenschaften der Projektdateien</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> - <source><b>Set Property</b><p>This sets a property for the project files.</p></source> - <translation><b>Eigenschaft definieren</b><p>Dies definiert eine Eigenschaft für alle Projektdateien.</p></translation> + <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> + <translation><b>Eigenschaften listen</b<p>Dies listet die Eigenschaften der Projektdateien.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> - <source>List Properties</source> - <translation>Eigenschaften listen</translation> + <source>Delete Property</source> + <translation>Eigenschaft löschen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> - <source>List Properties...</source> - <translation>Eigenschaften listen...</translation> + <source>Delete Property...</source> + <translation>Eigenschaft löschen...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> - <source>List properties of the project files</source> - <translation>Listet Eigenschaften der Projektdateien</translation> + <source>Delete a property for the project files</source> + <translation>Eine Eigenschaft für alle Projektdateien löschen</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> - <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> - <translation><b>Eigenschaften listen</b<p>Dies listet die Eigenschaften der Projektdateien.</p></translation> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation><b>Eigenschaft löschen</b><p>Dies löscht eine Eigenschaft für alle Projektdateien.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> + <source>Show repository info</source> + <translation>Zeige Repository Informationen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> + <source>Show some repository related information for the local project</source> + <translation>Zeige Repository bezogene Informationen des lokalen Projektes an</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> - <source>Delete Property</source> - <translation>Eigenschaft löschen</translation> + <source>Relocate</source> + <translation>Relozieren</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> - <source>Delete Property...</source> - <translation>Eigenschaft löschen...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> - <source>Delete a property for the project files</source> - <translation>Eine Eigenschaft für alle Projektdateien löschen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="410"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation><b>Eigenschaft löschen</b><p>Dies löscht eine Eigenschaft für alle Projektdateien.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="204"/> - <source>Show repository info</source> - <translation>Zeige Repository Informationen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="208"/> - <source>Show some repository related information for the local project</source> - <translation>Zeige Repository bezogene Informationen des lokalen Projektes an</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> - <source>Relocate</source> - <translation>Relozieren</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> <source>Relocate...</source> <translation>Relozieren...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="408"/> <source>Relocate the working copy to a new repository URL</source> <translation>Reloziere die Arbeitskopie zu einer neuen Repository URL</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="424"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="411"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>Relozieren</b><p>Dies reloziert die Arbeitskopie zu einer neuen Repository URL.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation><b>Zeige Repository Informationen</b><p>Dies zeigt Repository bezogene Informationen des lokalen Projektes an.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="175"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="162"/> <source>Show difference (URLs)</source> <translation>Unterschiede anzeigen (URLs)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="166"/> <source>Show the difference of the project between two repository URLs</source> <translation>Zeigt den Unterschied des Projektes zwischen zwei Repository URLs</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> <source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source> <translation><b>Unterschiede anzeigen (URLs)</b><p>Dies zeigt den Unterschied des Projektes zwischen zwei Repository URLs.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> <source>Repository Browser</source> <translation>Repository Browser</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> <source>Repository Browser...</source> <translation>Repository Browser...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <source>Show the Repository Browser dialog</source> + <translation>Zeigt den Repository Browser Dialog</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation><b>Repository Browser...</b><p>Dies zeigt den Repository Browser Dialog.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="118"/> + <source>Show log browser</source> + <translation>Zeige Log Browser</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/> + <source>Show a dialog to browse the log of the local project</source> + <translation>Zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="125"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation><b>Zeige Log Browser</b><p>Dies zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen. Zunächst wird nur eine begrenzte Anzahl an Einträgen angezeigt. Weitere können später geholt werden.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <source>Configure</source> + <translation>Einstellungen</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <source>Configure...</source> + <translation>Einstellungen...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> - <source>Show the Repository Browser dialog</source> - <translation>Zeigt den Repository Browser Dialog</translation> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation>Zeigt den Konfigurationsdialog mit ausgewählter Subversion Seite</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation><b>Repository Browser...</b><p>Dies zeigt den Repository Browser Dialog.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> - <source>Show log browser</source> - <translation>Zeige Log Browser</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="135"/> - <source>Show a dialog to browse the log of the local project</source> - <translation>Zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/> - <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> - <translation><b>Zeige Log Browser</b><p>Dies zeigt einen Dialog, um das Log des lokalen Projektes durchzusehen. Zunächst wird nur eine begrenzte Anzahl an Einträgen angezeigt. Weitere können später geholt werden.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> - <source>Configure</source> - <translation>Einstellungen</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> - <source>Configure...</source> - <translation>Einstellungen...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> - <source>Show the configuration dialog with the Subversion page selected</source> - <translation>Zeigt den Konfigurationsdialog mit ausgewählter Subversion Seite</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation><b>Einstellungen</b><p>Zeigt den Konfigurationsdialog mit ausgewählter Subversion Seite.</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <source>Conflicts resolved</source> + <translation>Konflikte gelöst</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <source>Con&flicts resolved</source> + <translation>&Konflikte gelöst</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation>Markiert alle Konflikte des lokalen Projektes als gelöst</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation><b>Konflikte gelöst</b><p>Dies markiert alle Konflikte des lokalen Projektes als gelöst.</p></translation> + </message> </context> <context> <name>SvnPropDelDialog</name> @@ -49522,17 +49481,17 @@ <context> <name>VersionControl</name> <message> - <location filename="VCS/VersionControl.py" line="536"/> + <location filename="VCS/VersionControl.py" line="547"/> <source>Process Generation Error</source> <translation>Fehler beim Prozessstart</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="536"/> + <location filename="VCS/VersionControl.py" line="547"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Der Prozess {0} konnte nicht gestartet werden. Stellen Sie sicher, dass er sich im Suchpfad befindet.</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="662"/> + <location filename="VCS/VersionControl.py" line="673"/> <source>Repository status checking is switched off</source> <translation>Repository Statusüberprüfung ist ausgeschaltet</translation> </message> @@ -53008,24 +52967,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1236"/> <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="1719"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1733"/> <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="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1741"/> <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="1238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1252"/> <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> @@ -53034,7 +52993,7 @@ <tr><td><b>Committed um</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -53051,24 +53010,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> <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="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> <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="1731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1745"/> <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="1734"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/> <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> @@ -53079,7 +53038,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Lesezeichen</b></td><td>{0}</td></tr></translation> </message> @@ -53323,17 +53282,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1458"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1473"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Repository Informationen</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Aktuelle Revision</b></td><td>{2}</td></tr><tr><td><b>Eingepflegte Revision</b></td><td>{3}</td></tr><tr><td><b>Einpflegedatum</b></td><td>{4}</td></tr><tr><td><b>Einpflegezeit</b></td><td>{5}</td></tr><tr><td><b>Letzter Autor</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1589"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1604"/> <source>unknown</source> <translation>Unbekannt</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1590"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Repository Informationen</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Aktuelle Revision</b></td><td>{4}</td></tr><tr><td><b>Eingepflegte Revision</b></td><td>{5}</td></tr><tr><td><b>Einpflegedatum</b></td><td>{6}</td></tr><tr><td><b>Einpflegezeit</b></td><td>{7}</td></tr><tr><td><b>Letzter Autor</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_en.ts Mon May 28 15:59:36 2012 +0200 +++ b/i18n/eric5_en.ts Tue May 29 20:59:40 2012 +0200 @@ -16425,277 +16425,277 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="252"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="254"/> + <source>The hg process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="256"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="310"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="325"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="369"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="371"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="533"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="585"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="647"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="649"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="840"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="842"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="873"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="875"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="925"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1176"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1352"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1597"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1611"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1650"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1839"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1882"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1976"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2185"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2305"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2367"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2381"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="479"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="481"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -19232,11 +19232,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> - <source>Resolve conflict</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> <source>Select all local file entries</source> <translation type="unfinished"></translation> @@ -19266,6 +19261,11 @@ <source>Do you really want to remove these files from the repository?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> + <source>Conflict resolved</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -19426,969 +19426,949 @@ </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> - <source>Add to repository</source> + <source>Remove from repository (and disk)</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> - <source>&Add to repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="225"/> - <source>Add the local project to the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228"/> - <source><b>Add to repository</b><p>This adds (imports) the local project to the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> - <source>Remove from repository (and disk)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> <source>&Remove from repository (and disk)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="239"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> <source>Remove the local project from the repository (and disk)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> <source><b>Remove from repository</b><p>This removes the local project from the repository (and disk).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Show log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Show &log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241"/> <source>Show the log of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="257"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="244"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>Show log browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="255"/> <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> + <source>Show difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> + <source>Show &difference</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> - <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> - <source>Show difference</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> - <source>Show &difference</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> <source>Show difference (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show &status</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> + <source>Show the status of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <source>Show heads</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> - <source>Show the status of the local project</source> + <source>Show the heads of the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> - <source>Show heads</source> + <source>Show parents</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> - <source>Show the heads of the repository</source> + <source>Show the parents of the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="328"/> - <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> + <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> - <source>Show parents</source> + <source>Show tip</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> - <source>Show the parents of the repository</source> + <source>Show the tip of the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="341"/> - <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> + <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> - <source>Show tip</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="351"/> - <source>Show the tip of the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/> - <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> - <source>Revert changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Re&vert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/> <source>Revert all changes made to the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Mer&ge changes...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> <source>Merge changes of a revision into the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> - <source>Resolve conflicts</source> + <source>Tag in repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> - <source>Resolve con&flicts</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="392"/> - <source>Resolve all conflicts of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> - <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> - <source>Tag in repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> <source>&Tag in repository...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> + <source>Tag the local project in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <source>List tags</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <source>List tags...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> - <source>Tag the local project in the repository</source> + <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="409"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>List tags</source> + <source>List branches</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>List tags...</source> + <source>List branches...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> - <source>List tags of the project</source> + <source>List branches of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source>List branches</source> + <source>Create branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source>List branches...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/> - <source>List branches of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> - <source>Create branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> <source>Create &branch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> <source>Create a new branch for the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> + <source>Close branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> + <source>Close the current branch of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> + <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> - <source>Close branch</source> + <source>Show current branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> - <source>Close the current branch of the local project</source> + <source>Show the current branch of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> + <source>Switch</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> - <source>Show current branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> - <source>Show the current branch of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> - <source>Switch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> <source>S&witch...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> + <source>Switch the working directory to another revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="491"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <source>Cleanup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <source>Cleanu&p</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> - <source>Switch the working directory to another revision</source> + <source>Cleanup the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> - <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> - <source>Cleanup</source> + <source>Execute command</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> - <source>Cleanu&p</source> + <source>E&xecute command...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> - <source>Cleanup the local project</source> + <source>Execute an arbitrary Mercurial command</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> - <source>Execute command</source> + <source>Command options</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> - <source>E&xecute command...</source> + <source>Command &options...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>Execute an arbitrary Mercurial command</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> - <source>Command options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> - <source>Command &options...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>Show the Mercurial command options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Configure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Configure...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <source>Show the configuration dialog with the Mercurial page selected</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> - <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> - <source>Configure</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> - <source>Configure...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> - <source>Show the configuration dialog with the Mercurial page selected</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <source>Show paths</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <source>Show paths...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <source>Show the aliases for remote repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> - <source>Show paths</source> + <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> - <source>Show paths...</source> + <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> - <source>Show the aliases for remote repositories</source> + <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Verify repository</source> + <source>Recover</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Verify repository...</source> + <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> - <source>Verify the integrity of the repository</source> + <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> - <source>Recover</source> + <source>Identify</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> - <source>Recover...</source> + <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> - <source>Recover from an interrupted transaction</source> + <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> - <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> - <source>Identify</source> + <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> - <source>Identify...</source> + <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> - <source>Identify the project directory</source> + <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> - <source><b>Identify</b><p>This identifies the project directory.</p></source> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> - <source>Create .hgignore</source> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> - <source>Create a .hgignore file with default values</source> + <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Create changegroup...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> - <source>Create changegroup file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="671"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Identify changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Identify changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Mark as "good"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <source>Mark a selectable changeset as good</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> + <source>Mark as "bad"</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> - <source>Mark as "good"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> - <source>Mark as "good"...</source> + <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> - <source>Mark a selectable changeset as good</source> + <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Mark as "bad"</source> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Mark as "bad"...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> - <source>Mark a selectable changeset as bad</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <source>Skip</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> - <source>Skip</source> + <source>Reset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <source>Reset the bisect search data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> - <source>Reset</source> + <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> - <source>Reset the bisect search data</source> + <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> + <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> + <source>Serve project repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> + <source>Serve project repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/> + <source>Serve the project repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> + <source><b>Serve project repository</b><p>This serves the project repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> + <source>Repository Administration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> + <source>Specials</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> + <source>Changegroup Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <source>Bisect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094"/> + <source>Pull</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> + <source>Push new branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <source>Push the current branch of the local project as a new named branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> + <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> - <source>Back out changeset</source> + <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> - <source>Back out changes of an earlier changeset</source> + <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> - <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> + <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care.</strong></p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> + <source>Show an editor to edit the user configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Edit repository configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> + <source>Edit repository configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> + <source>Show an editor to edit the repository configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Show combined configuration settings</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="578"/> + <source>Show the combined configuration settings from all configuration files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> + <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> + <source>Skip...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <source>Skip a selectable changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> + <source><b>Skip</b><p>This skips a selectable changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1311"/> + <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> - <source>Serve project repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> - <source>Serve project repository...</source> + <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> - <source>Serve the project repository</source> + <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> - <source><b>Serve project repository</b><p>This serves the project repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> - <source>Repository Administration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> - <source>Specials</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> - <source>Changegroup Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> - <source>Bisect</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> - <source>Pull</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> - <source>The project should be reread. Do this now?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> - <source>Push new branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> - <source>Push the current branch of the local project as a new named branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463"/> - <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> - <source>Rollback last transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> - <source>Rollback the last transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> - <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care.</strong></p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> - <source>Extensions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit user configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit user configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> - <source>Show an editor to edit the user configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Edit repository configuration</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> - <source>Show an editor to edit the repository configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> - <source>Show the combined configuration settings from all configuration files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> - <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> - <source>Skip...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> - <source>Skip a selectable changeset</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> - <source><b>Skip</b><p>This skips a selectable changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> - <source>Import Patch</source> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Import Patch...</source> + <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> - <source>Import a patch from a patch file</source> + <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> - <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> - <source>Patch Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344"/> - <source>Revert Changes</source> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> - <source>Export Patches</source> + <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> - <source>Export Patches...</source> + <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/> - <source>Export revisions to patch files</source> + <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> - <source>Change Phase...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> - <source>Change the phase of revisions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1349"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856"/> + <source>Copies changesets from another branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> - <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -29507,7 +29487,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3901"/> + <location filename="Project/Project.py" line="3903"/> <source>Profile Data</source> <translation type="unfinished"></translation> </message> @@ -29527,7 +29507,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3954"/> + <location filename="Project/Project.py" line="3956"/> <source>Application Diagram</source> <translation type="unfinished"></translation> </message> @@ -29547,7 +29527,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4085"/> + <location filename="Project/Project.py" line="4087"/> <source>Create Package List</source> <translation type="unfinished"></translation> </message> @@ -29567,7 +29547,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4245"/> + <location filename="Project/Project.py" line="4247"/> <source>Create Plugin Archive</source> <translation type="unfinished"></translation> </message> @@ -29692,77 +29672,77 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3834"/> + <location filename="Project/Project.py" line="3836"/> <source>Coverage Data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3880"/> + <location filename="Project/Project.py" line="3882"/> <source>There is no main script defined for the current project. Aborting</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3855"/> + <location filename="Project/Project.py" line="3857"/> <source>Code Coverage</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3855"/> + <location filename="Project/Project.py" line="3857"/> <source>Please select a coverage file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3901"/> + <location filename="Project/Project.py" line="3903"/> <source>Please select a profile file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3954"/> + <location filename="Project/Project.py" line="3956"/> <source>Include module names?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4058"/> + <location filename="Project/Project.py" line="4060"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4085"/> + <location filename="Project/Project.py" line="4087"/> <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4102"/> + <location filename="Project/Project.py" line="4104"/> <source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4110"/> + <location filename="Project/Project.py" line="4112"/> <source>The project does not have a main script defined. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4122"/> + <location filename="Project/Project.py" line="4124"/> <source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4133"/> + <location filename="Project/Project.py" line="4135"/> <source><p>The eric5 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4153"/> + <location filename="Project/Project.py" line="4155"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4165"/> + <location filename="Project/Project.py" line="4167"/> <source><p>The eric5 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4245"/> + <location filename="Project/Project.py" line="4247"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -37766,269 +37746,269 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> <source>The svn process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="195"/> <source>The svn process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="196"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="197"/> <source>Could not start the svn executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="221"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> <source>Create project in repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="221"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> <source>New project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="314"/> <source>Importing project into Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="363"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="364"/> <source>Subversion Checkout</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="385"/> <source>Checking project out of Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> <source>Subversion Export</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="445"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="446"/> <source>Exporting project from Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="530"/> <source>Commiting changes to Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="585"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="586"/> <source>Synchronizing with the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="686"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="687"/> <source>Adding files/directories to the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="785"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="786"/> <source>Adding directory trees to the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="820"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> <source>Removing files/directories from the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="882"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="883"/> <source>Moving {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> <source>Subversion Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="986"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="987"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1010"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1011"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> <source>Tagging {0} in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1074"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1075"/> <source>Reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1101"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1102"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1148"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1249"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1250"/> <source>Merging {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1512"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1527"/> <source>Cleaning up {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1548"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Subversion command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1655"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1670"/> <source>Resolving conficts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1694"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1709"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1776"/> <source>Subversion Set Property</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1794"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1809"/> <source>You have to supply a property name. Aborting.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1812"/> - <source>Subversion Delete Property</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1632"/> - <source>Enter property name</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="922"/> - <source>Subversion Log</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="922"/> - <source>Select number of entries to show.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1978"/> - <source>Locking in the Subversion repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2016"/> - <source>Unlocking in the Subversion repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2061"/> - <source>Relocating</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2087"/> - <source>Repository Browser</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2087"/> - <source>Enter the repository URL.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2111"/> - <source>Remove from changelist</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2147"/> - <source>Add to changelist</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2137"/> - <source>Enter name of the changelist:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="329"/> - <source>Imported revision {0}. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="554"/> - <source>Committed revision {0}.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1154"/> - <source>Revision {0}. -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1777"/> - <source>Property set.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> + <source>Subversion Delete Property</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1647"/> + <source>Enter property name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <source>Subversion Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <source>Select number of entries to show.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1993"/> + <source>Locking in the Subversion repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2031"/> + <source>Unlocking in the Subversion repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2076"/> + <source>Relocating</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <source>Repository Browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> + <source>Enter the repository URL.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2126"/> + <source>Remove from changelist</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2162"/> + <source>Add to changelist</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2152"/> + <source>Enter name of the changelist:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="330"/> + <source>Imported revision {0}. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="555"/> + <source>Committed revision {0}.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> + <source>Revision {0}. +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1792"/> + <source>Property set.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1842"/> <source>Property deleted.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1958"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> <source>Subversion Lock</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1958"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> <source>Enter lock comment</source> <translation type="unfinished"></translation> </message> @@ -39730,11 +39710,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> - <source>Resolve conflict</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="388"/> <source>Lock</source> <translation type="unfinished"></translation> @@ -39799,6 +39774,11 @@ <source>Show repository info</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> + <source>Conflict resolved</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -39864,524 +39844,504 @@ </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> - <source>Add to repository</source> + <source>Remove from repository (and disk)</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> - <source>&Add to repository...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="92"/> - <source>Add the local project to the VCS repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="95"/> - <source><b>Add to repository</b><p>This adds (imports) the local project to the VCS repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="102"/> - <source>Remove from repository (and disk)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="102"/> <source>&Remove from repository (and disk)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="93"/> <source>Remove the local project from the VCS repository (and disk)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="109"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="96"/> <source><b>Remove from repository</b><p>This removes the local project from the VCS repository (and disk).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> <source>Show log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> <source>Show &log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="121"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="108"/> <source>Show the log of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="124"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="111"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="118"/> <source>Show log browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/> <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="125"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/> + <source>Show difference</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/> + <source>Show &difference</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/> - <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> - <source>Show difference</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> - <source>Show &difference</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="151"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="141"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="161"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="148"/> <source>Show difference (extended)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="155"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="175"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="162"/> <source>Show difference (URLs)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="166"/> <source>Show the difference of the project between two repository URLs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> <source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="177"/> <source>Show status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="177"/> <source>Show &status</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="181"/> <source>Show the status of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>Tag in repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>&Tag in repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> <source>Tag the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> <source>Export from repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> <source>&Export from repository...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="224"/> + <source>Export a project from the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="227"/> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <source>Command options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <source>Command &options...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> - <source>Export a project from the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="240"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> - <source>Command options</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> - <source>Command &options...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="250"/> <source>Show the VCS command options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="251"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Revert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Re&vert changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> <source>Revert all changes made to the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="265"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> <source>Merge</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> <source>Mer&ge changes...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="263"/> <source>Merge changes of a tag/revision into the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="279"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> <source>Switch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> <source>S&witch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> <source>Switch the local copy to another tag/branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>Resolve conflicts</source> + <source>Cleanup</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> - <source>Resolve con&flicts</source> + <source>Cleanu&p</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> - <source>Resolve all conflicts of the local project</source> + <source>Cleanup the local project</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> - <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> - <source>Cleanup</source> + <source>Execute command</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> - <source>Cleanu&p</source> + <source>E&xecute command...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> - <source>Cleanup the local project</source> + <source>Execute an arbitrary VCS command</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> - <source>Execute command</source> + <source>List tags</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> - <source>E&xecute command...</source> + <source>List tags...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> - <source>Execute an arbitrary VCS command</source> + <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> - <source>List tags</source> + <source>List branches</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> - <source>List tags...</source> + <source>List branches...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> - <source>List tags of the project</source> + <source>List branches of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> - <source>List branches</source> + <source>List repository contents</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> - <source>List branches...</source> + <source>List repository contents...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> - <source>List branches of the project</source> + <source>Lists the contents of the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> - <source>List repository contents</source> + <source>Set Property</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> - <source>List repository contents...</source> + <source>Set Property...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> - <source>Lists the contents of the repository</source> + <source>Set a property for the project files</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> - <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> + <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> - <source>Set Property</source> + <source>List Properties</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> - <source>Set Property...</source> + <source>List Properties...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> - <source>Set a property for the project files</source> + <source>List properties of the project files</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> - <source><b>Set Property</b><p>This sets a property for the project files.</p></source> + <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> - <source>List Properties</source> + <source>Delete Property</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> - <source>List Properties...</source> + <source>Delete Property...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> - <source>List properties of the project files</source> + <source>Delete a property for the project files</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> - <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> - <source>Delete Property</source> + <source>Relocate</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> - <source>Delete Property...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> - <source>Delete a property for the project files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="410"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> - <source>Relocate</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> <source>Relocate...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="408"/> <source>Relocate the working copy to a new repository URL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="424"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="411"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> <source>Repository Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> <source>Repository Browser...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <source>Show the Repository Browser dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <source>Configure</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <source>Configure...</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> - <source>Show the Repository Browser dialog</source> + <source>Show the configuration dialog with the Subversion page selected</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> - <source>Configure</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> - <source>Configure...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> - <source>Show the configuration dialog with the Subversion page selected</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="204"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> <source>Show repository info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="208"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> <source>Show some repository related information for the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnPropDelDialog</name> @@ -49053,17 +49013,17 @@ <context> <name>VersionControl</name> <message> - <location filename="VCS/VersionControl.py" line="536"/> + <location filename="VCS/VersionControl.py" line="547"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/VersionControl.py" line="536"/> + <location filename="VCS/VersionControl.py" line="547"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="VCS/VersionControl.py" line="662"/> + <location filename="VCS/VersionControl.py" line="673"/> <source>Repository status checking is switched off</source> <translation type="unfinished"></translation> </message> @@ -52535,30 +52495,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1236"/> <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="1719"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1733"/> <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="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1741"/> <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="1238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1252"/> <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="1268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -52569,23 +52529,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> <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="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> <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="1731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1745"/> <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="1734"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/> <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> @@ -52593,7 +52553,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -52837,17 +52797,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1458"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1473"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1589"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1604"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1590"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_es.ts Mon May 28 15:59:36 2012 +0200 +++ b/i18n/eric5_es.ts Tue May 29 20:59:40 2012 +0200 @@ -16521,277 +16521,277 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/> <source>The hg process finished with the exit code {0}</source> <translation>El proceso hg ha terminado con código de salida {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="252"/> - <source>The hg process did not finish within 30s.</source> - <translation>El proceso hg no terminó en un plazo de 30s.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="254"/> + <source>The hg process did not finish within 30s.</source> + <translation>El proceso hg no terminó en un plazo de 30s.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="256"/> <source>Could not start the hg executable.</source> <translation>No se ha podido iniciar el ejecutable de hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> <source>Create project repository</source> <translation>Crear repositorio del proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> <source>The project repository could not be created.</source> <translation>No se ha podido crear el repositorio del proyecto.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="310"/> <source>Creating Mercurial repository</source> <translation>Creando repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="325"/> <source>Initial commit to Mercurial repository</source> <translation>Commit inicial al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="369"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="371"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonando proyecto desde un repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="533"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizando con el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="585"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Añadiendo archivos/directorios al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="647"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="649"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Eliminando archivos/directorios del repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/> <source>Renaming {0}</source> <translation>Renombrando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="925"/> <source>Merging</source> <translation>Haciendo un merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1352"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1597"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1611"/> <source>Pulling from a remote Mercurial repository</source> <translation>Haciendo pull de un repositorio remoto Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1650"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> <source>Pushing to a remote Mercurial repository</source> <translation>Haciendo push a un repositorio remoto Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Resolving files/directories</source> <translation>Resolviendo archivos/directorios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="840"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="842"/> <source>Taging in the Mercurial repository</source> <translation>Haciendo tag en el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="873"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="875"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1176"/> <source>Mercurial command</source> <translation>Comando de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> <source>Create Branch</source> <translation>Crear Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> <source>Enter branch name</source> <translation>Introducir nombre de branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> <source>Creating branch in the Mercurial repository</source> <translation>Creando branch en el repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1882"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verificando la integridad del repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Showing the combined configuration settings</source> <translation>Mostrando los ajustes de configuración combinados</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Showing aliases for remote repositories</source> <translation>Mostrando alias para repositorios remotos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>Recovering from interrupted transaction</source> <translation>Recuperando de transacción interrumpida</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> <source>Shall the working directory be updated?</source> <translation>¿Debe ser actualizado el directorio de trabajo?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1839"/> <source>Showing current branch</source> <translation>Mostrando la branch actual</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <source>Create changegroup</source> <translation>Crear changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> <source>Apply changegroups</source> <translation>Aplicar changegroups</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Subcomando bisect ({0}) inválido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1976"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> <source>Identifying project directory</source> <translation>Identificando directorio de proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Create .hgignore file</source> <translation>Crear archivo .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>El archivo <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2305"/> <source>Removing files from the Mercurial repository only</source> <translation>Eliminando archivos unicamente del repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Archivos Changegroup de Mercurial (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2185"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Archivos Changegroup de Mercurial (*.hg);;Todos los Archivos (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <source>Identifying changegroup file</source> <translation>Identificando archivo de changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> <source>Backing out changeset</source> <translation>Haciendo respaldo de changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> <source>No revision given. Aborting...</source> <translation>No se ha proporcionado revisión. Abortando...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo changegroup de Mercurial <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2367"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> <source>Rollback last transaction</source> <translation>Hacer Rollback de la última transacción</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2381"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>¿Está seguro de que quiere aplicar un rollback a la última transacción?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="479"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="481"/> <source>Committing changes to Mercurial repository</source> <translation>Haciendo commit de cambios al repositorio Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> <source>Mercurial Command Server</source> <translation>Servidor de Comandos de Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido reiniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>El Servidor de Comandos de Mercurial no ha podido iniciarse.</p><p>Razón: {0}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/> <source>Export Patches</source> <translation>Exportar Patches</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <source>Change Phase</source> <translation>Cambiar Fase</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> @@ -19353,7 +19353,7 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> <source>Resolve conflict</source> - <translation>Resolver conflicto</translation> + <translation type="obsolete">Resolver conflicto</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> @@ -19405,6 +19405,11 @@ <source>Do you really want to remove these files from the repository?</source> <translation>¿Realmente quiere eliminar estos archivos del repositorio?</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> + <source>Conflict resolved</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -19551,710 +19556,710 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Add to repository</source> - <translation>Añadir al repositorio</translation> + <translation type="obsolete">Añadir al repositorio</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>&Add to repository...</source> - <translation>&Añadir al repositorio...</translation> + <translation type="obsolete">&Añadir al repositorio...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="225"/> <source>Add the local project to the repository</source> - <translation>Añadir el proyecto local al repositorio</translation> + <translation type="obsolete">Añadir el proyecto local al repositorio</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228"/> <source><b>Add to repository</b><p>This adds (imports) the local project to the repository.</p></source> - <translation><b>Añadir al repositorio</b><p>Añade (import) el proyecto local al repositorio.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <translation type="obsolete"><b>Añadir al repositorio</b><p>Añade (import) el proyecto local al repositorio.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Remove from repository (and disk)</source> <translation>Eliminar del repositorio (y del disco)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>&Remove from repository (and disk)</source> <translation>Eliminar del &repositorio (y del disco)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="239"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> <source>Remove the local project from the repository (and disk)</source> <translation>Eliminar el proyecto local del repositorio (y del disco)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> <source><b>Remove from repository</b><p>This removes the local project from the repository (and disk).</p></source> <translation><b>Eliminar del repositorio</b><p>Elimina el proyecto local del repositorio (y del disco).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Show log</source> <translation>Mostrar log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Show &log</source> <translation>Mostrar &log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241"/> <source>Show the log of the local project</source> <translation>Mostrar el log del proyecto local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="257"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="244"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Mostrar log</b><p>Muestra el log del proyecto local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>Show log browser</source> <translation>Mostrar navegador de log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="255"/> <source>Show a dialog to browse the log of the local project</source> <translation>Mostrar un diálogo para navegar el log del proyecto local</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation><b>Mostrar navegador de log</b><p>Muestra un diálogo para navegar el log del proyecto local. Al principio se muestra un número limitado de entradas. Se pueden recuperar más entradas despues.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> + <source>Show difference</source> + <translation>Mostrar diferencia</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> + <source>Show &difference</source> + <translation>Mostrar &diferencia</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> - <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> - <translation><b>Mostrar navegador de log</b><p>Muestra un diálogo para navegar el log del proyecto local. Al principio se muestra un número limitado de entradas. Se pueden recuperar más entradas despues.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> - <source>Show difference</source> - <translation>Mostrar diferencia</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> - <source>Show &difference</source> - <translation>Mostrar &diferencia</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> <source>Show the difference of the local project to the repository</source> <translation>Muestra las diferencias entre el proyecto local y el repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation><b>Mostrar direfencia</b><p>Muestra la diferencia que hay entre el proyecto local y el repositorio.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> <source>Show difference (extended)</source> <translation>Mostrar diferencia (extendida)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Muestra la diferencia de revisiones entre el proyecto local y el repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation><b>Mostrar direfencia (extendida)</b><p>Muestra la diferencia entre revisiones seleccionables del proyecto.</p></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <source>Show heads</source> + <translation>Mostrar heads</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> + <source>Show the heads of the repository</source> + <translation>Mostrar los heads del repositorio</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> + <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> + <translation><b>Mostrar heads</b><p>Muestra los heads del repositorio.</p></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> - <source>Show heads</source> - <translation>Mostrar heads</translation> + <source>Show parents</source> + <translation>Mostrar parents</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> - <source>Show the heads of the repository</source> - <translation>Mostrar los heads del repositorio</translation> + <source>Show the parents of the repository</source> + <translation>Mostrar los parents del repositorio</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="328"/> - <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> - <translation><b>Mostrar heads</b><p>Muestra los heads del repositorio.</p></translation> + <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> + <translation><b>Mostrar parents</b><p>Muestra los parents del repositorio.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> - <source>Show parents</source> - <translation>Mostrar parents</translation> + <source>Show tip</source> + <translation>Mostrar tip</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> - <source>Show the parents of the repository</source> - <translation>Mostrar los parents del repositorio</translation> + <source>Show the tip of the repository</source> + <translation>Mostrar el tip del repositorio</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="341"/> - <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> - <translation><b>Mostrar parents</b><p>Muestra los parents del repositorio.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> - <source>Show tip</source> - <translation>Mostrar tip</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="351"/> - <source>Show the tip of the repository</source> - <translation>Mostrar el tip del repositorio</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Mostrar tip</b><p>Muestra el tip del repositorio.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Merge</source> <translation>Hacer merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Mer&ge changes...</source> <translation>Hacer mer&ge de los cambios...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> <source>Merge changes of a revision into the local project</source> <translation>Hacer merge de los cambios de una revision en el proyecto local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Merge</b><p>Hace un merge de los cambios de una revision en el proyecto local.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve conflicts</source> - <translation>Resolver conflictos</translation> + <translation type="obsolete">Resolver conflictos</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve con&flicts</source> - <translation>Resolver con&flictos</translation> + <translation type="obsolete">Resolver con&flictos</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="392"/> <source>Resolve all conflicts of the local project</source> - <translation>Resolver todos los conflictos del proyecto local</translation> + <translation type="obsolete">Resolver todos los conflictos del proyecto local</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> - <translation><b>Resolver conflictos</b><p>Resuelve todos los conflictos del proyecto local.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> + <translation type="obsolete"><b>Resolver conflictos</b><p>Resuelve todos los conflictos del proyecto local.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show status</source> <translation>Mostrar estado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show &status</source> <translation>Mostrar e&stado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> <source>Show the status of the local project</source> <translation>Mostrar el estado del proyecto local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Mostrar estado</b><p>Muestra el estado del proyecto local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> <source>Re&vert changes</source> <translation>Re&vertir cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/> <source>Revert all changes made to the local project</source> <translation>Revertir todos los cambios hechos al proyecto local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Revertir cambios</b><p>Revierte todos los cambios hechos al proyecto local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Tag in repository</source> <translation>Crear un Tag en el repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>&Tag in repository...</source> <translation>Crear un &Tag en el repositorio...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> + <source>Tag the local project in the repository</source> + <translation>Crea un tag del proyecto local en el repositorio</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Crear un Tag en el repositorio</b><p>Crea un tag del proyecto local en el repositorio.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <source>List tags</source> + <translation>Listar tags</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <source>List tags...</source> + <translation>Listar tags...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> - <source>Tag the local project in the repository</source> - <translation>Crea un tag del proyecto local en el repositorio</translation> + <source>List tags of the project</source> + <translation>Lista los tags del proyecto</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="409"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Crear un Tag en el repositorio</b><p>Crea un tag del proyecto local en el repositorio.</p></translation> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Listar tags</b><p>Lista los tags del proyecto.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>List tags</source> - <translation>Listar tags</translation> + <source>List branches</source> + <translation>Listar branches</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>List tags...</source> - <translation>Listar tags...</translation> + <source>List branches...</source> + <translation>Listar branches...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> - <source>List tags of the project</source> - <translation>Lista los tags del proyecto</translation> + <source>List branches of the project</source> + <translation>Lista las branches del proyecto</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>Listar tags</b><p>Lista los tags del proyecto.</p></translation> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Listar branches</b><p>Lista las branches del proyecto.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source>List branches</source> - <translation>Listar branches</translation> + <source>Create branch</source> + <translation>Crear branch</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source>List branches...</source> - <translation>Listar branches...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/> - <source>List branches of the project</source> - <translation>Lista las branches del proyecto</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Listar branches</b><p>Lista las branches del proyecto.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> - <source>Create branch</source> - <translation>Crear branch</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> <source>Create &branch...</source> <translation>Crear &branch...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> <source>Create a new branch for the local project in the repository</source> <translation>Crear una nueva branch para el proyecto local en el repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Crear branch</b><p>Crea una nueva branch para el proyecto local en el repositorio.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> <source>Close branch</source> <translation>Cerrar branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> <source>Close the current branch of the local project</source> <translation>Cerrar la branch actual para el proyecto local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Cerrar branch</b><p>Cierra la branch actual del proyecto local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source>Switch</source> <translation>Hacer switch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source>S&witch...</source> <translation>Hacer s&witch...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> + <source>Switch the working directory to another revision</source> + <translation>Hacer switch del directorio de trabajo a otra revisión</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="491"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation><b>Hacer switch</b><p>Hace un switch del directorio de trabajo a otra revisión.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <source>Cleanup</source> + <translation>Limpiar (cleanup)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <source>Cleanu&p</source> + <translation>Lim&piar (cleanup)</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> - <source>Switch the working directory to another revision</source> - <translation>Hacer switch del directorio de trabajo a otra revisión</translation> + <source>Cleanup the local project</source> + <translation>Limpiar (cleanup) el proyecto local</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> - <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> - <translation><b>Hacer switch</b><p>Hace un switch del directorio de trabajo a otra revisión.</p></translation> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Limpieza (cleanup)</b><p>Lleva a cabo un cleanup del proyecto local.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> - <source>Cleanup</source> - <translation>Limpiar (cleanup)</translation> + <source>Execute command</source> + <translation>Ejecutar comando</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> - <source>Cleanu&p</source> - <translation>Lim&piar (cleanup)</translation> + <source>E&xecute command...</source> + <translation>E&jecutar comando...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> - <source>Cleanup the local project</source> - <translation>Limpiar (cleanup) el proyecto local</translation> + <source>Execute an arbitrary Mercurial command</source> + <translation>Ejecuta un comando Mercurial arbitrario</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Limpieza (cleanup)</b><p>Lleva a cabo un cleanup del proyecto local.</p></translation> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> + <translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando Mercurial arbitrario.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> - <source>Execute command</source> - <translation>Ejecutar comando</translation> + <source>Command options</source> + <translation>Opciones de comando</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> - <source>E&xecute command...</source> - <translation>E&jecutar comando...</translation> + <source>Command &options...</source> + <translation>&Opciones de comando...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>Execute an arbitrary Mercurial command</source> - <translation>Ejecuta un comando Mercurial arbitrario</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> - <translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando Mercurial arbitrario.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> - <source>Command options</source> - <translation>Opciones de comando</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> - <source>Command &options...</source> - <translation>&Opciones de comando...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>Show the Mercurial command options</source> <translation>Mostrar opciones de comando Mercurial</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> + <translation><b>Opciones de comando...</b><p>Muestra un diálogo para editar las opciones de comando Mercurial.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Configure</source> + <translation>Configurar</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Configure...</source> + <translation>Configurar...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <source>Show the configuration dialog with the Mercurial page selected</source> + <translation>Mostrar el diálogo de configuración con la página de Mercurial seleccionada</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> - <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> - <translation><b>Opciones de comando...</b><p>Muestra un diálogo para editar las opciones de comando Mercurial.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> - <source>Configure</source> - <translation>Configurar</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> - <source>Configure...</source> - <translation>Configurar...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> - <source>Show the configuration dialog with the Mercurial page selected</source> - <translation>Mostrar el diálogo de configuración con la página de Mercurial seleccionada</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Configurar</b><p>Mostrar el diálogo de configuración con la página de Mercurial seleccionada.</p></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <source>Show paths</source> + <translation>Mostrar rutas</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <source>Show paths...</source> + <translation>Mostrar rutas...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <source>Show the aliases for remote repositories</source> + <translation>Mostrar los alias para los repositorios remotos</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation><b>Mostrar rutas</b><p>Muestra los alias para los repositorios remotos.</p></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> - <source>Show paths</source> - <translation>Mostrar rutas</translation> + <source>Verify repository</source> + <translation>Verificar repositorio</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> - <source>Show paths...</source> - <translation>Mostrar rutas...</translation> + <source>Verify repository...</source> + <translation>Verificar repositorio...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> - <source>Show the aliases for remote repositories</source> - <translation>Mostrar los alias para los repositorios remotos</translation> + <source>Verify the integrity of the repository</source> + <translation>Verificar la integridad del repositorio</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation><b>Mostrar rutas</b><p>Muestra los alias para los repositorios remotos.</p></translation> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation><b>Verificar repositorio</b><p>Verifica la integridad del repositorio.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Verify repository</source> - <translation>Verificar repositorio</translation> + <source>Recover</source> + <translation>Recuperar</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Verify repository...</source> - <translation>Verificar repositorio...</translation> + <source>Recover...</source> + <translation>Recuperar...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> - <source>Verify the integrity of the repository</source> - <translation>Verificar la integridad del repositorio</translation> + <source>Recover from an interrupted transaction</source> + <translation>Recuperar de una transacción interrumpida</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> - <translation><b>Verificar repositorio</b><p>Verifica la integridad del repositorio.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> - <source>Recover</source> - <translation>Recuperar</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> - <source>Recover...</source> - <translation>Recuperar...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> - <source>Recover from an interrupted transaction</source> - <translation>Recuperar de una transacción interrumpida</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Recuperar</b><p>Recupera de una transacción interrumpida.</p></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <source>Create .hgignore</source> + <translation>Crear .hgignore</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <source>Create a .hgignore file with default values</source> + <translation>Creare un archivo .hgignore con valores por defecto</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation><b>Crear .hgignore</b><p>Crea un archivo .hgignore con valores por defecto.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> + <source>Repository Administration</source> + <translation>Administración del Repositorio</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> - <source>Create .hgignore</source> - <translation>Crear .hgignore</translation> + <source>Create changegroup</source> + <translation>Crear changegroup</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <source>Create changegroup...</source> + <translation>Crear changegroup...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> - <source>Create a .hgignore file with default values</source> - <translation>Creare un archivo .hgignore con valores por defecto</translation> + <source>Create changegroup file collecting changesets</source> + <translation>Crea un archivo de changegroup recogiendo changesets</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> + <source>Apply changegroups</source> + <translation>Aplicar changegroups</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <source>Apply changegroups...</source> + <translation>Aplicar changegroups...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> + <source>Apply one or several changegroup files</source> + <translation>Aplicar uno o varios archivos de changegroup</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> + <source>Changegroup Management</source> + <translation>Gestión de Chagegroup</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation><b>Crear .hgignore</b><p>Crea un archivo .hgignore con valores por defecto.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> - <source>Repository Administration</source> - <translation>Administración del Repositorio</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Create changegroup</source> - <translation>Crear changegroup</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Create changegroup...</source> - <translation>Crear changegroup...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> - <source>Create changegroup file collecting changesets</source> - <translation>Crea un archivo de changegroup recogiendo changesets</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> - <source>Apply changegroups</source> - <translation>Aplicar changegroups</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> - <source>Apply changegroups...</source> - <translation>Aplicar changegroups...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> - <source>Apply one or several changegroup files</source> - <translation>Aplicar uno o varios archivos de changegroup</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> - <source>Changegroup Management</source> - <translation>Gestión de Chagegroup</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Crear changegroup</b><p>Crea un archivo de changegroup recogiendo los changeset seleccionados (hg bundle).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Aplicar changegroups</b><p>Aplica uno o varios archivos de changegroup generados por la acción 'Crear changegroup' (hg unbundle).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source>Show current branch</source> <translation>Mostrar la branch actual</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> <source>Show the current branch of the project</source> <translation>Mostrar la branch actual del proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Mostrar branch actual</b><p>Muestra la branch actual del proyecto.</p></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Mark as "good"</source> + <translation>Marcar como "bueno"</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <source>Mark a selectable changeset as good</source> + <translation>Marcar un changeset seleccionable como bueno</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation><b>Marcar como bueno</b><p>Marca un changeset seleccionable como bueno.</p></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> - <source>Mark as "good"</source> - <translation>Marcar como "bueno"</translation> + <source>Mark as "bad"</source> + <translation>Marcar como "malo"</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> - <source>Mark a selectable changeset as good</source> - <translation>Marcar un changeset seleccionable como bueno</translation> + <source>Mark a selectable changeset as bad</source> + <translation>Marcar un changeset seleccionable como malo</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation><b>Marcar como bueno</b><p>Marca un changeset seleccionable como bueno.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Mark as "bad"</source> - <translation>Marcar como "malo"</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> - <source>Mark a selectable changeset as bad</source> - <translation>Marcar un changeset seleccionable como malo</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Marcar como malo</b><p>Marca un changeset seleccionable como malo.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> - <source>Skip</source> - <translation>Saltar</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> - <source>Reset</source> - <translation>Reiniciar</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> - <source>Reset the bisect search data</source> - <translation>Reiniciar los datos de búsqueda de bisect</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> - <translation><b>Reiniciar</b><p>Reinicia los datos de búsqueda de bisect.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> - <source>Bisect</source> - <translation>Bisect</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> - <source>Mark as "good"...</source> - <translation>Marcar como "bueno"...</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> + <source>Skip</source> + <translation>Saltar</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <source>Reset</source> + <translation>Reiniciar</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <source>Reset the bisect search data</source> + <translation>Reiniciar los datos de búsqueda de bisect</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> + <translation><b>Reiniciar</b><p>Reinicia los datos de búsqueda de bisect.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <source>Bisect</source> + <translation>Bisect</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Mark as "good"...</source> + <translation>Marcar como "bueno"...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "bad"...</source> <translation>Marcar como "malo"...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Preview changegroup</source> <translation>Previsualizar changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Preview changegroup...</source> <translation>Previsualizar changegroup...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Identify</source> <translation>Identificar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Identify...</source> <translation>Identificar...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> <source>Identify the project directory</source> <translation>Identificar el directorio de proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identificar</b><p>Identifica el directorio de proyecto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="671"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Previsualizar un archivo de changegroup conteniendo una colección de changesets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Previsualizar changegroup</b><p>Previsualiza un archivo de changegroup conteniendo una colección de changesets.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Identify changegroup</source> <translation>Identificar changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Identify changegroup...</source> <translation>Identificar changegroup...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation>Identificar un archivo de changegroup conteniendo una colección de changesets</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation><b>Identificar changegroup</b><p>Identifica un archivo de changegroup conteniendo una colección de changesets.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Back out changeset</source> <translation>Hacer respaldo de changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Back out changes of an earlier changeset</source> <translation>Hacer respaldo de cambios de un changeset anterior</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Hacer respaldo de changeset</b><p>Hace un respaldo de cambios de un changeset anterior.</p></translation> </message> @@ -20274,260 +20279,280 @@ <translation><b>Hacer push de cambios (force)</b><p>Se hace un push de los cambios desde el repositorio local a un repositorio remoto utilizando la opción 'force'.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> <source>Specials</source> <translation>Especial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Serve project repository</source> <translation>Servir repositorio de proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Serve project repository...</source> <translation>Servir repositorio de proyecto...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/> <source>Serve the project repository</source> <translation>Servir el repositorio de proyecto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Servir repositorio de proyecto</b><p>Esto sirve el repositorio de proyecto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094"/> <source>Pull</source> <translation>Hacer Pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> <source>Push new branch</source> <translation>Hacer push de nueva rama</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> <source>Push the current branch of the local project as a new named branch</source> <translation>Ejecutar push de la rama actual del proyecto local como una nueva rama con nombre</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation><b>Hacer push de nueva rama</b><p>Hace un push de la rama actual del proyecto local como una nueva rama con nombre.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Rollback last transaction</source> <translation>Rollback de última transacción</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source>Rollback the last transaction</source> <translation>Rollback de la última transacción</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care.</strong></p></source> <translation><b>Rollback de última transacción</b><p>Lleva a cabo un rollback de la última transacción. Las transactiones se utilizan para encapsular los efectos de todos los comandos que crean nuevos changesets or propagan changesets existentes hacia un repository. Por ejemplo, los siguientes comandos son transaccionales, y sus efectos pueden ser revertidos (rollback):<ul><li>commit</li><li>import</li><li>pull</li><li>push (con este repositorio como destino)</li><li>unbundle</li></ul></p><p><strong>Este comando es peligroso. Utiliícelo por favor con cuidado.</strong></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> <source>Extensions</source> <translation>Extensiones</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source>Edit user configuration</source> + <translation>Editar configuración de usuario</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source>Edit user configuration...</source> + <translation>Editar configuración de usuario...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> + <source>Show an editor to edit the user configuration file</source> + <translation>Mostrar un editor para editar el archivo de configuración de usuario</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation><b>Editar configuración de usuario</b><p>Mostrar un editor para editar el archivo de configuración de usuario.</p></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit user configuration</source> - <translation>Editar configuración de usuario</translation> + <source>Edit repository configuration</source> + <translation>Editar configuración del repositorio</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit user configuration...</source> - <translation>Editar configuración de usuario...</translation> + <source>Edit repository configuration...</source> + <translation>Editar configuración del repositorio...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> - <source>Show an editor to edit the user configuration file</source> - <translation>Mostrar un editor para editar el archivo de configuración de usuario</translation> + <source>Show an editor to edit the repository configuration file</source> + <translation>Mostrar un editor para editar el archivo de configuración del repositorio</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> - <translation><b>Editar configuración de usuario</b><p>Mostrar un editor para editar el archivo de configuración de usuario.</p></translation> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation><b>Editar configuración del repositorio</b><p>Mostrar un editor para editar el archivo de configuración del repositorio.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Edit repository configuration</source> - <translation>Editar configuración del repositorio</translation> + <source>Show combined configuration settings</source> + <translation>Mostrar ajustes de configuración combinados</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Edit repository configuration...</source> - <translation>Editar configuración del repositorio...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> - <source>Show an editor to edit the repository configuration file</source> - <translation>Mostrar un editor para editar el archivo de configuración del repositorio</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation><b>Editar configuración del repositorio</b><p>Mostrar un editor para editar el archivo de configuración del repositorio.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> - <source>Show combined configuration settings</source> - <translation>Mostrar ajustes de configuración combinados</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> <source>Show combined configuration settings...</source> <translation>Mostrar ajustes de configuración combinados...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="578"/> <source>Show the combined configuration settings from all configuration files</source> <translation>Mostrar los ajustes de configuración combinados de todos los archivos de configuración</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation><b>Mostrar ajustes de configuración combinados</b><p>Muestra los ajustes de configuración combinados de todos los archivos de configuración.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Skip...</source> <translation>Ignorar...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Skip a selectable changeset</source> <translation>Ignorar un changeset seleccionable</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation><b>Ignorar</b><p>Ignora un changeset seleccionable.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1311"/> <source>Import Patch</source> <translation>Importar Patch</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <source>Import Patch...</source> + <translation>Importar Patch...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> + <source>Import a patch from a patch file</source> + <translation>Importar un patch desde un archivo de patch</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation><b>Importar Patch</b><p>Importa un patch desde un archivo de patch al proyecto.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/> + <source>Patch Management</source> + <translation>Gestión de Patch</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <source>Revert Changes</source> + <translation>Revertir cambios</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Import Patch...</source> - <translation>Importar Patch...</translation> + <source>Export Patches</source> + <translation>Exportar Patches</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <source>Export Patches...</source> + <translation>Exportar Patches...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> - <source>Import a patch from a patch file</source> - <translation>Importar un patch desde un archivo de patch</translation> + <source>Export revisions to patch files</source> + <translation>Exportar revisiones a archivos de patch</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> - <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> - <translation><b>Importar Patch</b><p>Importa un patch desde un archivo de patch al proyecto.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> - <source>Patch Management</source> - <translation>Gestión de Patch</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344"/> - <source>Revert Changes</source> - <translation>Revertir cambios</translation> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> + <translation><b>Exportar Patches</b><p>Exporta revisiones del proyecto a archivos de patch.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> - <source>Export Patches</source> - <translation>Exportar Patches</translation> + <source>Change Phase</source> + <translation>Cambiar Fase</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> - <source>Export Patches...</source> - <translation>Exportar Patches...</translation> + <source>Change Phase...</source> + <translation>Cambiar Fase...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/> - <source>Export revisions to patch files</source> - <translation>Exportar revisiones a archivos de patch</translation> + <source>Change the phase of revisions</source> + <translation>Cambiar la fase de revisiones</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation><b>Exportar Patches</b><p>Exporta revisiones del proyecto a archivos de patch.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> - <source>Change Phase</source> - <translation>Cambiar Fase</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> - <source>Change Phase...</source> - <translation>Cambiar Fase...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> - <source>Change the phase of revisions</source> - <translation>Cambiar la fase de revisiones</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation><b>Cambiar Fase</b><p>Cambia la fase de revisiones.</p></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1349"/> + <source>Copy Changesets</source> + <translation>Copiar Changesets</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856"/> + <source>Copies changesets from another branch</source> + <translation>Copiar changesets de otra branch</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> + <translation><b>Copiar Changesets</b><p>Copia changesets de otra branch encima del directorio de trabajo actual con el usuario, fecha y descripción del changeset original.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <source>Continue Copying Session</source> + <translation>Continuar Sesión de Copia</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation>Continuar la última sesión de copia despues de resolver los conflictos</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation><b>Continuar Sesión de C opia</b><p>Continua la última sesión de copia despues de resolver los conflictos.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> + <source>Graft</source> + <translation>Graft</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> - <source>Copy Changesets</source> - <translation>Copiar Changesets</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> - <source>Copies changesets from another branch</source> - <translation>Copiar changesets de otra branch</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> - <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> - <translation><b>Copiar Changesets</b><p>Copia changesets de otra branch encima del directorio de trabajo actual con el usuario, fecha y descripción del changeset original.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> - <source>Continue Copying Session</source> - <translation>Continuar Sesión de Copia</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation>Continuar la última sesión de copia despues de resolver los conflictos</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation><b>Continuar Sesión de C opia</b><p>Continua la última sesión de copia despues de resolver los conflictos.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> - <source>Graft</source> - <translation>Graft</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> <source>Copy Changesets (Continue)</source> <translation>Copiar Changesets (Continuar)</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -29512,7 +29537,7 @@ <translation><b>Cobertura de Código...</b><p>Muestra la información de cobertura de código para todos los archivos Python en el proyecto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3901"/> + <location filename="Project/Project.py" line="3903"/> <source>Profile Data</source> <translation>Datos de perfil</translation> </message> @@ -29532,7 +29557,7 @@ <translation><b>Datos de Profiling...</b><p>Muestra datos de profiling para el proyecto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3954"/> + <location filename="Project/Project.py" line="3956"/> <source>Application Diagram</source> <translation>Diagrama de Aplicación</translation> </message> @@ -29552,7 +29577,7 @@ <translation><b>Diagrama de Aplicación...</b><p>Muestra un diagrama del proyecto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="4085"/> + <location filename="Project/Project.py" line="4087"/> <source>Create Package List</source> <translation>Crear Lista del Paquete</translation> </message> @@ -29562,7 +29587,7 @@ <translation>Crear Lista del &Paquete</translation> </message> <message> - <location filename="Project/Project.py" line="4245"/> + <location filename="Project/Project.py" line="4247"/> <source>Create Plugin Archive</source> <translation>Crear Archivo de Plugin</translation> </message> @@ -29647,47 +29672,47 @@ <translation>Sistema de control de versiones</translation> </message> <message> - <location filename="Project/Project.py" line="3834"/> + <location filename="Project/Project.py" line="3836"/> <source>Coverage Data</source> <translation>Datos de Cobertura</translation> </message> <message> - <location filename="Project/Project.py" line="3880"/> + <location filename="Project/Project.py" line="3882"/> <source>There is no main script defined for the current project. Aborting</source> <translation>No hay script principal definido para el proyecto actual. Abortando</translation> </message> <message> - <location filename="Project/Project.py" line="3855"/> + <location filename="Project/Project.py" line="3857"/> <source>Code Coverage</source> <translation>Cobertura de codigo</translation> </message> <message> - <location filename="Project/Project.py" line="3855"/> + <location filename="Project/Project.py" line="3857"/> <source>Please select a coverage file</source> <translation>Por favor seleccione un archivo de cobertura</translation> </message> <message> - <location filename="Project/Project.py" line="3901"/> + <location filename="Project/Project.py" line="3903"/> <source>Please select a profile file</source> <translation>Por favor seleccione un archivo de profiling</translation> </message> <message> - <location filename="Project/Project.py" line="3954"/> + <location filename="Project/Project.py" line="3956"/> <source>Include module names?</source> <translation>¿Incluir nombres de módulos?</translation> </message> <message> - <location filename="Project/Project.py" line="4058"/> + <location filename="Project/Project.py" line="4060"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation><p>El archivo <b>PKGLIST</b> ya existe.</p><p>¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="Project/Project.py" line="4102"/> + <location filename="Project/Project.py" line="4104"/> <source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source> <translation><p>El archivo <b>PKGLIST</b> no existe. Abortando...</p></translation> </message> <message> - <location filename="Project/Project.py" line="4110"/> + <location filename="Project/Project.py" line="4112"/> <source>The project does not have a main script defined. Aborting...</source> <translation>No hay script principal definido para el proyecto actual. Abortando...</translation> </message> @@ -29902,32 +29927,32 @@ <translation><p>El VCS seleccionado <b>{0}</b> no ha sido encontrado.<br>Deshabilitando control de versiones.</p><p>{1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4085"/> + <location filename="Project/Project.py" line="4087"/> <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> <translation><p>El archivo <b>PKGLIST</b> no puede ser creado.</p><p>Causa: {0}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4122"/> + <location filename="Project/Project.py" line="4124"/> <source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source> <translation><p>El archivo <b>PKGLIST</b> no puede ser leido.</p><p>Causa: {0}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4133"/> + <location filename="Project/Project.py" line="4135"/> <source><p>The eric5 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation><p>El archivo de plugin de eric5 <b>{0}</b> no ha podido ser creado. Abortando...</p><p>Razón: {1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4153"/> + <location filename="Project/Project.py" line="4155"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation><p>El fichero<b>{0}</b> no ha podido ser almacenado en el archivo. Va a ser ignorado.</p><p>Causa: {1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4165"/> + <location filename="Project/Project.py" line="4167"/> <source><p>The eric5 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation><p>El archivo de plugin de eric5 <b>{0}</b> se ha creado satisfactoriamente.</p></translation> </message> <message> - <location filename="Project/Project.py" line="4245"/> + <location filename="Project/Project.py" line="4247"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation><p>El archivo de plugin<b>{0}</b> no puede ser leido.</p><p>Causa: {1}</p></translation> </message> @@ -38119,202 +38144,202 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="195"/> <source>The svn process did not finish within 30s.</source> <translation>El proceso svn no terminó en un plazo de 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="196"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="197"/> <source>Could not start the svn executable.</source> <translation>No se ha podido ejecutar svn.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="221"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> <source>Create project in repository</source> <translation>Crear proyecto en el repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="221"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>El proyecto no se ha podido crear en el repositorio. Quizá el repositorio proporcionado no existe o el servidor está caído.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> <source>New project</source> <translation>Proyecto nuevo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>No se ha podido hacer un checkout del proyecto en el repositorio.<br/>Restaurando los contenidos originales.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="314"/> <source>Importing project into Subversion repository</source> <translation>Importando proyecto al repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="363"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="364"/> <source>Subversion Checkout</source> <translation>Checkout de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>El tag debe ser una tag (tags) normal o branch (branches). Por favor, seleccione de la lista.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="385"/> <source>Checking project out of Subversion repository</source> <translation>Haciendo checkout del proyecto desde el repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> <source>Subversion Export</source> <translation>Export de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="445"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="446"/> <source>Exporting project from Subversion repository</source> <translation>Exportando proyecto desde el repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="530"/> <source>Commiting changes to Subversion repository</source> <translation>Haciendo commit de los cambios al repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="585"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="586"/> <source>Synchronizing with the Subversion repository</source> <translation>Sincronizando con el repositorio de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="686"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="687"/> <source>Adding files/directories to the Subversion repository</source> <translation>Añadiendo archivos/directorios al repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="785"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="786"/> <source>Adding directory trees to the Subversion repository</source> <translation>Añadiendo árboles de directorios al repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="820"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> <source>Removing files/directories from the Subversion repository</source> <translation>Eliminando archivos/directorios del repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> <source>Subversion Error</source> <translation>Error de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="986"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="987"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>La URL del repositorio del proyecto no ha podido recuperarse de la copia de trabajo. La operación tag se abortará</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1010"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1011"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>La URL del repositorio del proyecto tiene un formato no válido. La operación tag se abortará</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1074"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1075"/> <source>Reverting changes</source> <translation>Revirtiendo cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1101"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1102"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>La URL del repositorio del proyecto no ha podido recuperarse de la copia de trabajo. La operación switch se abortará</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>La URL del repositorio del proyecto tiene un formato no válido. La operación switch se abortará</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1548"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Subversion command</source> <translation>Comando de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1655"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1670"/> <source>Resolving conficts</source> <translation>Resolviendo conflictos</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1776"/> <source>Subversion Set Property</source> <translation>Asignar Propiedad de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1794"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1809"/> <source>You have to supply a property name. Aborting.</source> <translation>Tiene que proporcionar un nombre de propiedad. Abortando.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1812"/> - <source>Subversion Delete Property</source> - <translation>Borrar Propiedad de Subversion</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1632"/> - <source>Enter property name</source> - <translation>Introducir nombre de la propiedad</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="922"/> - <source>Subversion Log</source> - <translation>Log de Subversion</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="922"/> - <source>Select number of entries to show.</source> - <translation>Seleccionar número de entradas a mostrar.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1978"/> - <source>Locking in the Subversion repository</source> - <translation>Bloqueando en el repositorio Subversion</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2016"/> - <source>Unlocking in the Subversion repository</source> - <translation>Desbloqueando en el repositorio Subversion</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1777"/> - <source>Property set.</source> - <translation>Propiedad establecida.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> + <source>Subversion Delete Property</source> + <translation>Borrar Propiedad de Subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1647"/> + <source>Enter property name</source> + <translation>Introducir nombre de la propiedad</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <source>Subversion Log</source> + <translation>Log de Subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <source>Select number of entries to show.</source> + <translation>Seleccionar número de entradas a mostrar.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1993"/> + <source>Locking in the Subversion repository</source> + <translation>Bloqueando en el repositorio Subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2031"/> + <source>Unlocking in the Subversion repository</source> + <translation>Desbloqueando en el repositorio Subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1792"/> + <source>Property set.</source> + <translation>Propiedad establecida.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1842"/> <source>Property deleted.</source> <translation>Propiedad borrada.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1958"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> <source>Subversion Lock</source> <translation>Bloqueo de Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1958"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> <source>Enter lock comment</source> <translation>Introducir comentario para el bloqueo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2076"/> <source>Relocating</source> <translation>Realojando</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> <source>Repository Browser</source> <translation>Navegador de Repositorios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> <source>Enter the repository URL.</source> <translation>Introducir la URL del repositorio.</translation> </message> @@ -38469,17 +38494,17 @@ <translation>Sin versionar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2111"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2126"/> <source>Remove from changelist</source> <translation>Quitar de la lista de cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2162"/> <source>Add to changelist</source> <translation>Añadir a la lista de cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2137"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2152"/> <source>Enter name of the changelist:</source> <translation>Introduzca el nombre de la lista de cambios:</translation> </message> @@ -38499,53 +38524,53 @@ <translation>Lista de cambios movida</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> <source>The svn process finished with the exit code {0}</source> <translation>El proceso svn ha terminado con código de salida {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="882"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="883"/> <source>Moving {0}</source> <translation>Moviendo {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> <source>Tagging {0} in the Subversion repository</source> <translation>Haciendo un tag {0} en el repositorio Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1148"/> <source>Switching to {0}</source> <translation>Haciendo un switch a {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1249"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1250"/> <source>Merging {0}</source> <translation>Haciendo un merge de {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1512"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1527"/> <source>Cleaning up {0}</source> <translation>Limpiando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1694"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1709"/> <source>Copying {0}</source> <translation>Copiando {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="329"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="330"/> <source>Imported revision {0}. </source> <translation>Importada revisión {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="554"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="555"/> <source>Committed revision {0}.</source> <translation>Commit realizado para revisión {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1154"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> <source>Revision {0}. </source> <translation>Revisión {0}.</translation> @@ -40093,7 +40118,7 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> <source>Resolve conflict</source> - <translation>Resolver conflicto</translation> + <translation type="obsolete">Resolver conflicto</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="388"/> @@ -40175,6 +40200,11 @@ <source>Remove from Changelist</source> <translation>Quitar de la lista de cambios</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> + <source>Conflict resolved</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -40241,523 +40271,543 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>Add to repository</source> - <translation>Añadir al repositorio</translation> + <translation type="obsolete">Añadir al repositorio</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>&Add to repository...</source> - <translation>&Añadir al repositorio...</translation> + <translation type="obsolete">&Añadir al repositorio...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="92"/> <source>Add the local project to the VCS repository</source> - <translation>Añadir el proyecto local al repositorio VCS</translation> + <translation type="obsolete">Añadir el proyecto local al repositorio VCS</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="95"/> <source><b>Add to repository</b><p>This adds (imports) the local project to the VCS repository.</p></source> - <translation><b>Añadir al repositorio</b><p>Añade (import) el proyecto local al repositorio VCS.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="102"/> + <translation type="obsolete"><b>Añadir al repositorio</b><p>Añade (import) el proyecto local al repositorio VCS.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>Remove from repository (and disk)</source> <translation>Eliminar del repositorio (y del disco)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>&Remove from repository (and disk)</source> <translation>Eliminar del &repositorio (y del disco)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="93"/> <source>Remove the local project from the VCS repository (and disk)</source> <translation>Eliminar el proyecto local del repositorio VCS (y del disco)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="109"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="96"/> <source><b>Remove from repository</b><p>This removes the local project from the VCS repository (and disk).</p></source> <translation><b>Eliminar del repositorio</b><p>Elimina el proyecto local del repositorio VCS (y del disco).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> <source>Show log</source> <translation>Mostrar log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> <source>Show &log</source> <translation>Mostrar &log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="121"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="108"/> <source>Show the log of the local project</source> <translation>Mostrar el log del proyecto local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="124"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="111"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Mostrar log</b><p>Muestra el log del proyecto local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/> <source>Show difference</source> <translation>Mostrar diferencia</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/> <source>Show &difference</source> <translation>Mostrar &diferencia</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/> <source>Show the difference of the local project to the repository</source> <translation>Muestra las diferencias entre el proyecto local y el repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="141"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation><b>Mostrar direfencia</b><p>Muestra la diferencia que hay entre el proyecto local y el repositorio.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="161"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="148"/> <source>Show difference (extended)</source> <translation>Mostrar diferencia (extendida)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Muestra la diferencia de revisiones entre el proyecto local y el repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="155"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation><b>Mostrar direfencia (extendida)</b><p>Muestra la diferencia entre revisiones seleccionables del proyecto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="175"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="162"/> <source>Show difference (URLs)</source> <translation>Mostrar diferencia (URLs)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="166"/> <source>Show the difference of the project between two repository URLs</source> <translation>Muestra la diferencia de revisiones entre dos URLs de repositorios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> <source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source> <translation><b>Mostrar direfencia (URLs)</b><p>Muestra la diferencia del proyecto entre dos URLs de repositorios.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="177"/> <source>Show status</source> <translation>Mostrar estado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="177"/> <source>Show &status</source> <translation>Mostrar e&stado</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="181"/> <source>Show the status of the local project</source> <translation>Mostrar el estado del proyecto local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Mostrar estado</b><p>Muestra el estado del proyecto local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>Tag in repository</source> <translation>Crear un Tag en el repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>&Tag in repository...</source> <translation>Crear un &Tag en el repositorio...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> <source>Tag the local project in the repository</source> <translation>Crea un tag del proyecto local en el repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Crear un Tag en el repositorio</b><p>Crea un tag del proyecto local en el repositorio.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> <source>Export from repository</source> <translation>Exportar desde repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> <source>&Export from repository...</source> <translation>&Exportar desde repositorio...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="224"/> + <source>Export a project from the repository</source> + <translation>Exportar un proyecto desde el repositorio</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="227"/> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>Exportar desde repositorio</b><p>Exporta un proyecto desde el repositorio.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <source>Command options</source> + <translation>Opciones de comando</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <source>Command &options...</source> + <translation>&Opciones de comando...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> - <source>Export a project from the repository</source> - <translation>Exportar un proyecto desde el repositorio</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="240"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation><b>Exportar desde repositorio</b><p>Exporta un proyecto desde el repositorio.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> - <source>Command options</source> - <translation>Opciones de comando</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> - <source>Command &options...</source> - <translation>&Opciones de comando...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="250"/> <source>Show the VCS command options</source> <translation>Mostrar opciones de comando VCS</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="251"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> <translation><b>Opciones de comando...</b><p>Muestra un diálogo para editar las opciones de comando VCS.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Revert changes</source> <translation>Revertir cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Re&vert changes</source> <translation>Re&vertir cambios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> <source>Revert all changes made to the local project</source> <translation>Revertir todos los cambios hechos al proyecto local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="265"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Revertir cambios</b><p>Revierte todos los cambios hechos al proyecto local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> <source>Merge</source> <translation>Hacer merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> <source>Mer&ge changes...</source> <translation>Hacer mer&ge de los cambios...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="263"/> <source>Merge changes of a tag/revision into the local project</source> <translation>Hacer merge de los cambios de una tag/revision en el proyecto local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="279"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Merge</b><p>Hace un merge de los cambios de una tag/revision al proyecto local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> <source>Switch</source> <translation>Hacer switch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> <source>S&witch...</source> <translation>Hacer s&witch...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> <source>Switch the local copy to another tag/branch</source> <translation>Hace un switch de la copia local a otra tag/branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>Hacer switch</b><p>Hace un switch de la copia local a otra tag/branch.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Resolve conflicts</source> - <translation>Resolver conflictos</translation> + <translation type="obsolete">Resolver conflictos</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Resolve con&flicts</source> - <translation>Resolver con&flictos</translation> + <translation type="obsolete">Resolver con&flictos</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> <source>Resolve all conflicts of the local project</source> - <translation>Resolver todos los conflictos del proyecto local</translation> + <translation type="obsolete">Resolver todos los conflictos del proyecto local</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> - <translation><b>Resolver conflictos</b><p>Resuelve todos los conflictos del proyecto local.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <translation type="obsolete"><b>Resolver conflictos</b><p>Resuelve todos los conflictos del proyecto local.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Cleanup</source> <translation>Limpiar (cleanup)</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <source>Cleanu&p</source> + <translation>Lim&piar (cleanup)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> + <source>Cleanup the local project</source> + <translation>Hacer limpieza (cleanup) del proyecto local</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Limpieza (cleanup)</b><p>Ejecuta un cleanup del proyecto local.</p></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> - <source>Cleanu&p</source> - <translation>Lim&piar (cleanup)</translation> + <source>Execute command</source> + <translation>Ejecutar comando</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <source>E&xecute command...</source> + <translation>E&jecutar comando...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> - <source>Cleanup the local project</source> - <translation>Hacer limpieza (cleanup) del proyecto local</translation> + <source>Execute an arbitrary VCS command</source> + <translation>Ejecuta un comando VCS arbitrario</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Limpieza (cleanup)</b><p>Ejecuta un cleanup del proyecto local.</p></translation> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> + <translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando VCS arbitrario.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> - <source>Execute command</source> - <translation>Ejecutar comando</translation> + <source>List tags</source> + <translation>Listar tags</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> - <source>E&xecute command...</source> - <translation>E&jecutar comando...</translation> + <source>List tags...</source> + <translation>Listar tags...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> - <source>Execute an arbitrary VCS command</source> - <translation>Ejecuta un comando VCS arbitrario</translation> + <source>List tags of the project</source> + <translation>Lista los tags del proyecto</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> - <translation><b>Ejecutar comando</b><p>Abre un diálogo para introducir un comando VCS arbitrario.</p></translation> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Listar tags</b><p>Lista los tags del proyecto.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> - <source>List tags</source> - <translation>Listar tags</translation> + <source>List branches</source> + <translation>Listar branches</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> - <source>List tags...</source> - <translation>Listar tags...</translation> + <source>List branches...</source> + <translation>Listar branches...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> - <source>List tags of the project</source> - <translation>Lista los tags del proyecto</translation> + <source>List branches of the project</source> + <translation>Lista las branches del proyecto</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>Listar tags</b><p>Lista los tags del proyecto.</p></translation> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Listar branches</b><p>Lista las branches del proyecto.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> - <source>List branches</source> - <translation>Listar branches</translation> + <source>List repository contents</source> + <translation>Listar contenido del repositorio</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> - <source>List branches...</source> - <translation>Listar branches...</translation> + <source>List repository contents...</source> + <translation>Listar contenido del repositorio...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> - <source>List branches of the project</source> - <translation>Lista las branches del proyecto</translation> + <source>Lists the contents of the repository</source> + <translation>Lista el contenido del repositorio</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Listar branches</b><p>Lista las branches del proyecto.</p></translation> + <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> + <translation><b>Listar contenido del repositorio</b><p>Lista el contenido del repositorio.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> - <source>List repository contents</source> - <translation>Listar contenido del repositorio</translation> + <source>Set Property</source> + <translation>Establecer propiedad</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> - <source>List repository contents...</source> - <translation>Listar contenido del repositorio...</translation> + <source>Set Property...</source> + <translation>Establecer propiedad...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> - <source>Lists the contents of the repository</source> - <translation>Lista el contenido del repositorio</translation> + <source>Set a property for the project files</source> + <translation>Establece una propiedad para los archivos del proyecto</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> - <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> - <translation><b>Listar contenido del repositorio</b><p>Lista el contenido del repositorio.</p></translation> + <source><b>Set Property</b><p>This sets a property for the project files.</p></source> + <translation><b>Establecer Propiedad</b><p>Establece una propiedad para los archivos del proyecto.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> - <source>Set Property</source> - <translation>Establecer propiedad</translation> + <source>List Properties</source> + <translation>Listar propiedades</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> - <source>Set Property...</source> - <translation>Establecer propiedad...</translation> + <source>List Properties...</source> + <translation>Listar propiedades...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> - <source>Set a property for the project files</source> - <translation>Establece una propiedad para los archivos del proyecto</translation> + <source>List properties of the project files</source> + <translation>Listar propiedades de los archivos del proyecto</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> - <source><b>Set Property</b><p>This sets a property for the project files.</p></source> - <translation><b>Establecer Propiedad</b><p>Establece una propiedad para los archivos del proyecto.</p></translation> + <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> + <translation><b>Listar Propiedades</b><p>Lista las propiedades de los archivos del proyecto.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> - <source>List Properties</source> - <translation>Listar propiedades</translation> + <source>Delete Property</source> + <translation>Borrar propiedad</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> - <source>List Properties...</source> - <translation>Listar propiedades...</translation> + <source>Delete Property...</source> + <translation>Borrar propiedad...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> - <source>List properties of the project files</source> - <translation>Listar propiedades de los archivos del proyecto</translation> + <source>Delete a property for the project files</source> + <translation>Borrar una propiedad de los archivos del proyecto</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> - <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> - <translation><b>Listar Propiedades</b><p>Lista las propiedades de los archivos del proyecto.</p></translation> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation><b>Borrar Propiedad</b><p>Borra una propiedad de los archivos del proyecto.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> + <source>Show repository info</source> + <translation>Mostrar informacion del repositorio</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> + <source>Show some repository related information for the local project</source> + <translation>Mostrar información relacionada con el repositorio para el proyecto local</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> + <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> + <translation><b>Mostrar información del repositorio</b><p>Muestra información relacionada con el repositorio para el proyecto local.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> - <source>Delete Property</source> - <translation>Borrar propiedad</translation> + <source>Relocate</source> + <translation>Trasladar (relocate)</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> - <source>Delete Property...</source> - <translation>Borrar propiedad...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> - <source>Delete a property for the project files</source> - <translation>Borrar una propiedad de los archivos del proyecto</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="410"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation><b>Borrar Propiedad</b><p>Borra una propiedad de los archivos del proyecto.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="204"/> - <source>Show repository info</source> - <translation>Mostrar informacion del repositorio</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="208"/> - <source>Show some repository related information for the local project</source> - <translation>Mostrar información relacionada con el repositorio para el proyecto local</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> - <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> - <translation><b>Mostrar información del repositorio</b><p>Muestra información relacionada con el repositorio para el proyecto local.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> - <source>Relocate</source> - <translation>Trasladar (relocate)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> <source>Relocate...</source> <translation>Trasladar (relocate)...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="408"/> <source>Relocate the working copy to a new repository URL</source> <translation>Trasladar la copia de trabajo a una nueva URL de repositorio</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="424"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="411"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>Trasladar (relocate)</b><p>Traslada la copia de trabajo a una nueva URL de repositorio.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> <source>Repository Browser</source> <translation>Navegador de Repositorios</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> <source>Repository Browser...</source> <translation>Navegador de Repositorios...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <source>Show the Repository Browser dialog</source> + <translation>Mostrar diálogo de Navegador de Repositorios</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation><b>Navegador de Repositorios</b><p>Muestra el diálogo de Navegador de Repositorios.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="118"/> + <source>Show log browser</source> + <translation>Mostrar navegador de log</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/> + <source>Show a dialog to browse the log of the local project</source> + <translation>Mostrar un diálogo para navegar el log del proyecto local</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="125"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation><b>Mostrar navegador de log</b><p>Muestra un diálogo para navegar el log del proyecto local. Al principio se muestra un número limitado de entradas. Se pueden recuperar más entradas despues.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <source>Configure</source> + <translation>Configurar</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <source>Configure...</source> + <translation>Configurar...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> - <source>Show the Repository Browser dialog</source> - <translation>Mostrar diálogo de Navegador de Repositorios</translation> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation>Mostrar el diálogo de configuración con la página de Subversion seleccionada</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation><b>Navegador de Repositorios</b><p>Muestra el diálogo de Navegador de Repositorios.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> - <source>Show log browser</source> - <translation>Mostrar navegador de log</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="135"/> - <source>Show a dialog to browse the log of the local project</source> - <translation>Mostrar un diálogo para navegar el log del proyecto local</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/> - <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> - <translation><b>Mostrar navegador de log</b><p>Muestra un diálogo para navegar el log del proyecto local. Al principio se muestra un número limitado de entradas. Se pueden recuperar más entradas despues.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> - <source>Configure</source> - <translation>Configurar</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> - <source>Configure...</source> - <translation>Configurar...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> - <source>Show the configuration dialog with the Subversion page selected</source> - <translation>Mostrar el diálogo de configuración con la página de Subversion seleccionada</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation><b>Configurar</b><p>Mostrar el diálogo de configuración con la página de Subversion seleccionada.</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnPropDelDialog</name> @@ -49489,17 +49539,17 @@ <context> <name>VersionControl</name> <message> - <location filename="VCS/VersionControl.py" line="536"/> + <location filename="VCS/VersionControl.py" line="547"/> <source>Process Generation Error</source> <translation>Error de Generación de Proceso</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="662"/> + <location filename="VCS/VersionControl.py" line="673"/> <source>Repository status checking is switched off</source> <translation>El chequeo de estado del repositorio está deshabilitado</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="536"/> + <location filename="VCS/VersionControl.py" line="547"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>El proceso {0} no se ha podido ejecutar. Verifique que está en la ruta de búsqueda (search path).</translation> </message> @@ -53057,17 +53107,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1733"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiquetas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1741"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1734"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/> <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> @@ -53078,31 +53128,31 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Pista</b></td><td></td></tr> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1745"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Padres</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1236"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Padre #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1252"/> <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> @@ -53111,7 +53161,7 @@ <tr><td><b>Hora de commit</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -53128,7 +53178,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message> @@ -53372,17 +53422,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1589"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1604"/> <source>unknown</source> <translation>desconocido</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1458"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1473"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Información del repositorio</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Revisión actual</b></td><td>{2}</td></tr><tr><td><b>Revisión enviada</b></td><td>{3}</td></tr><tr><td><b>Fecha de envío</b></td><td>{4}</td></tr><tr><td><b>Hora de envío</b></td><td>{5}</td></tr><tr><td><b>Último autor</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1590"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Information del repositorio</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Revisión enviada</b></td><td>{5}</td></tr><tr><td><b>Fecha de envío</b></td><td>{6}</td></tr><tr><td><b>Hora de envio</b></td><td>{7}</td></tr><tr><td><b>Último autor</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_fr.ts Mon May 28 15:59:36 2012 +0200 +++ b/i18n/eric5_fr.ts Tue May 29 20:59:40 2012 +0200 @@ -18035,87 +18035,87 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="252"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="254"/> + <source>The hg process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="256"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="310"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="325"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="369"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="371"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="533"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="585"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="647"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="649"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="840"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="842"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="873"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="875"/> <source>Reverting changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="925"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1176"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1352"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -18125,192 +18125,192 @@ <translation type="obsolete">Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1597"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1611"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1650"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1882"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1839"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1976"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2305"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2185"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2367"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2381"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="479"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="481"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -20899,7 +20899,7 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> <source>Resolve conflict</source> - <translation type="unfinished">Résoudre les conflits</translation> + <translation type="obsolete">Résoudre les conflits</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> @@ -20936,6 +20936,11 @@ <source>Do you really want to remove these files from the repository?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> + <source>Conflict resolved</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -21081,61 +21086,46 @@ </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> - <source>Add to repository</source> - <translation type="unfinished"></translation> + <source>&Add to repository...</source> + <translation type="obsolete">&Ajouter au référentiel...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> + <source>Remove from repository (and disk)</source> + <translation type="unfinished">Supprimer du référentiel (et du disque)</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> - <source>&Add to repository...</source> - <translation type="unfinished">&Ajouter au référentiel...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="225"/> - <source>Add the local project to the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228"/> - <source><b>Add to repository</b><p>This adds (imports) the local project to the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> - <source>Remove from repository (and disk)</source> - <translation type="unfinished">Supprimer du référentiel (et du disque)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> <source>&Remove from repository (and disk)</source> <translation type="unfinished">&Supprimer du référentiel (et du disque)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="239"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> <source>Remove the local project from the repository (and disk)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> <source><b>Remove from repository</b><p>This removes the local project from the repository (and disk).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Show log</source> <translation type="unfinished">Afficher le log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Show &log</source> <translation type="unfinished">Afficher le &log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241"/> <source>Show the log of the local project</source> <translation type="unfinished">Affiche le log du projet local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="257"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="244"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation type="unfinished"><b>Afficher le log</b><p>Affiche le log du projet local</p></translation> </message> @@ -21155,652 +21145,652 @@ <translation type="obsolete"><b>Afficher un log limité</b><p>Affiche le log du projet limité aux entrées sélectionnées</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>Show log browser</source> <translation type="unfinished">Afficher le navigateur de logs</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="255"/> <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished">Affiche une fenêtre permettant de parcourir les logs du projet local</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation type="unfinished"><b>Navigateur de logs</b><p>Affiche une fenêtre permettant de parcourir les messages logs du projet local. La fenêtre n'affiche qu'un nombre limité d'entrées, mais un bouton permet d'afficher les logs plus anciens.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> + <source>Show difference</source> + <translation type="unfinished">Afficher les différences</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> + <source>Show &difference</source> + <translation type="unfinished">Afficher les &différences</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> - <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> - <translation type="unfinished"><b>Navigateur de logs</b><p>Affiche une fenêtre permettant de parcourir les messages logs du projet local. La fenêtre n'affiche qu'un nombre limité d'entrées, mais un bouton permet d'afficher les logs plus anciens.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> - <source>Show difference</source> - <translation type="unfinished">Afficher les différences</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> - <source>Show &difference</source> - <translation type="unfinished">Afficher les &différences</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished">Affiche les différences entre le projet local et le référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation type="unfinished"><b>Afficher les différences</b><p>Affiche les différences du projet local avec le référentiel.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> <source>Show difference (extended)</source> <translation type="unfinished">Afficher les différences (étendu)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished">Affiche les différences entre le référentiel et les différentes révisions du projet</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation type="unfinished"><b>Afficher les différences (etendu)</b><p>Affiche les différences du projet entre différentes révisions.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show status</source> <translation type="unfinished">Afficher l'état (status)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show &status</source> <translation type="unfinished">Affich&er l'état VCS</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> + <source>Show the status of the local project</source> + <translation type="unfinished">Affiche l'état du projet local par rapport au référentiel VCS</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation type="unfinished"><b>Afficher l'état VCS</b><p>Affiche l'état du projet local par rapport au référentiel VCS.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <source>Show heads</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> - <source>Show the status of the local project</source> - <translation type="unfinished">Affiche l'état du projet local par rapport au référentiel VCS</translation> + <source>Show the heads of the repository</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation type="unfinished"><b>Afficher l'état VCS</b><p>Affiche l'état du projet local par rapport au référentiel VCS.</p></translation> + <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> - <source>Show heads</source> + <source>Show parents</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> - <source>Show the heads of the repository</source> + <source>Show the parents of the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="328"/> - <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> + <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> - <source>Show parents</source> + <source>Show tip</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> - <source>Show the parents of the repository</source> + <source>Show the tip of the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="341"/> - <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> + <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> - <source>Show tip</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="351"/> - <source>Show the tip of the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/> - <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Revert changes</source> <translation type="unfinished">Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> <source>Re&vert changes</source> <translation type="unfinished">&Recharger le projet</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/> <source>Revert all changes made to the local project</source> <translation type="unfinished">Recharger le projet et écraser toutes les modifications locales</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"><b>Recharger le projet</b><p>Recharge le projet et écrase toutes les modifications effectuées localement.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Merge</source> <translation type="unfinished">Fusionner</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Mer&ge changes...</source> <translation type="unfinished">&Fusionner les modifications...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> <source>Merge changes of a revision into the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve conflicts</source> - <translation type="unfinished">Résoudre les confits</translation> + <translation type="obsolete">Résoudre les confits</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve con&flicts</source> - <translation type="unfinished">Résoudre les con&fits</translation> + <translation type="obsolete">Résoudre les con&fits</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="392"/> <source>Resolve all conflicts of the local project</source> - <translation type="unfinished">Résout tous les conflits du projet local</translation> + <translation type="obsolete">Résout tous les conflits du projet local</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> - <translation type="unfinished"><b>Résolution des conflits</b><p>Résout tous les conflits VCS du projet local.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> + <translation type="obsolete"><b>Résolution des conflits</b><p>Résout tous les conflits VCS du projet local.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Tag in repository</source> <translation type="unfinished">Etiqueter au niveau du référentiel (tag)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>&Tag in repository...</source> <translation type="unfinished">&Etiqueter dans le référentiel...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> + <source>Tag the local project in the repository</source> + <translation type="unfinished">Etiquette le projet local dans le référentiel</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation type="unfinished"><b>Etiqueter dans le référentiel</b><p>Etiquette le projet local dans le référentiel (opération "tag").</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <source>List tags</source> + <translation type="unfinished">Lister les étiquettes</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <source>List tags...</source> + <translation type="unfinished">Lister les étiquettes...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> - <source>Tag the local project in the repository</source> - <translation type="unfinished">Etiquette le projet local dans le référentiel</translation> + <source>List tags of the project</source> + <translation type="unfinished">Liste les étiquettes du projet</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="409"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation type="unfinished"><b>Etiqueter dans le référentiel</b><p>Etiquette le projet local dans le référentiel (opération "tag").</p></translation> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation type="unfinished"><b>Liste des étiquettes</b><p>Liste les étiquettes du projet.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>List tags</source> - <translation type="unfinished">Lister les étiquettes</translation> + <source>List branches</source> + <translation type="unfinished">Lister les branches</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>List tags...</source> - <translation type="unfinished">Lister les étiquettes...</translation> + <source>List branches...</source> + <translation type="unfinished">Lister les branches...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> - <source>List tags of the project</source> - <translation type="unfinished">Liste les étiquettes du projet</translation> + <source>List branches of the project</source> + <translation type="unfinished">Liste les branches du projet</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation type="unfinished"><b>Liste des étiquettes</b><p>Liste les étiquettes du projet.</p></translation> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation type="unfinished"><b>Liste des branches</b><p>Effectue la liste de toutes les branches de développement du projet.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source>List branches</source> - <translation type="unfinished">Lister les branches</translation> + <source>Create branch</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source>List branches...</source> - <translation type="unfinished">Lister les branches...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/> - <source>List branches of the project</source> - <translation type="unfinished">Liste les branches du projet</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation type="unfinished"><b>Liste des branches</b><p>Effectue la liste de toutes les branches de développement du projet.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> - <source>Create branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> <source>Create &branch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> <source>Create a new branch for the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> <source>Close branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> <source>Close the current branch of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source>Switch</source> <translation type="unfinished">Basculer de version</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source>S&witch...</source> <translation type="unfinished">&Basculer de version...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> + <source>Switch the working directory to another revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="491"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <source>Cleanup</source> + <translation type="unfinished">Nettoyer</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <source>Cleanu&p</source> + <translation type="unfinished">&Nettoyer</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> - <source>Switch the working directory to another revision</source> - <translation type="unfinished"></translation> + <source>Cleanup the local project</source> + <translation type="unfinished">Nettoyer le projet local</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> - <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> - <translation type="unfinished"></translation> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation type="unfinished"><b>Nettoyer</b><p>Permet de nettoyer le projet local.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> - <source>Cleanup</source> - <translation type="unfinished">Nettoyer</translation> + <source>Execute command</source> + <translation type="unfinished">Exécuter une commande</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> - <source>Cleanu&p</source> - <translation type="unfinished">&Nettoyer</translation> + <source>E&xecute command...</source> + <translation type="unfinished">E&xécuter une commande...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> - <source>Cleanup the local project</source> - <translation type="unfinished">Nettoyer le projet local</translation> + <source>Execute an arbitrary Mercurial command</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation type="unfinished"><b>Nettoyer</b><p>Permet de nettoyer le projet local.</p></translation> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> - <source>Execute command</source> - <translation type="unfinished">Exécuter une commande</translation> + <source>Command options</source> + <translation type="unfinished">Options de commande</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> - <source>E&xecute command...</source> - <translation type="unfinished">E&xécuter une commande...</translation> + <source>Command &options...</source> + <translation type="unfinished">&Options de commande...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>Execute an arbitrary Mercurial command</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> - <source>Command options</source> - <translation type="unfinished">Options de commande</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> - <source>Command &options...</source> - <translation type="unfinished">&Options de commande...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>Show the Mercurial command options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Configure</source> + <translation type="unfinished">Configuration</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Configure...</source> + <translation type="unfinished">Configuration...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <source>Show the configuration dialog with the Mercurial page selected</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> - <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> - <source>Configure</source> - <translation type="unfinished">Configuration</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> - <source>Configure...</source> - <translation type="unfinished">Configuration...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> - <source>Show the configuration dialog with the Mercurial page selected</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <source>Show paths</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <source>Show paths...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <source>Show the aliases for remote repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> - <source>Show paths</source> + <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> - <source>Show paths...</source> + <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> - <source>Show the aliases for remote repositories</source> + <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Verify repository</source> + <source>Recover</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Verify repository...</source> + <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> - <source>Verify the integrity of the repository</source> + <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> - <source>Recover</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> - <source>Recover...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> - <source>Recover from an interrupted transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <source>Create .hgignore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> - <source>Create .hgignore</source> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> - <source>Create a .hgignore file with default values</source> + <source>Create changegroup file collecting changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <source>Apply changegroups...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> + <source>Apply one or several changegroup files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> + <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Create changegroup...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> - <source>Create changegroup file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> - <source>Apply changegroups...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> - <source>Apply one or several changegroup files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> - <source>Changegroup Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source>Show current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> <source>Show the current branch of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Mark as "good"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <source>Mark a selectable changeset as good</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> - <source>Mark as "good"</source> + <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> - <source>Mark a selectable changeset as good</source> + <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Mark as "bad"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> - <source>Mark a selectable changeset as bad</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> - <source>Skip</source> - <translation type="unfinished">Passer</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> - <source>Reset</source> - <translation type="unfinished">Réinitialiser</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> - <source>Reset the bisect search data</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> - <source>Bisect</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> - <source>Mark as "good"...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> + <source>Skip</source> + <translation type="unfinished">Passer</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <source>Reset</source> + <translation type="unfinished">Réinitialiser</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <source>Reset the bisect search data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <source>Bisect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="671"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Identify changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Identify changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> @@ -21820,260 +21810,280 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care.</strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> + <source>Show an editor to edit the user configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit user configuration</source> + <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit user configuration...</source> + <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> - <source>Show an editor to edit the user configuration file</source> + <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Edit repository configuration</source> + <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> - <source>Show an editor to edit the repository configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="578"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1311"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Import Patch...</source> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> - <source>Import a patch from a patch file</source> + <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> - <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> - <source>Patch Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344"/> - <source>Revert Changes</source> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> - <source>Export Patches</source> + <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> - <source>Export Patches...</source> + <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/> - <source>Export revisions to patch files</source> + <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> - <source>Change Phase...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> - <source>Change the phase of revisions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1349"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856"/> + <source>Copies changesets from another branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> - <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -31676,7 +31686,7 @@ <translation><b>Code Coverage...</b><p>Affiche les informations de code coverage pour le projet.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3901"/> + <location filename="Project/Project.py" line="3903"/> <source>Profile Data</source> <translation>Profiling des données</translation> </message> @@ -31736,7 +31746,7 @@ <translation type="obsolete"><b>Supprimer Cyclops le rapport Cyclops</b><p>Supprime le rapport Cyclops du projet.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3954"/> + <location filename="Project/Project.py" line="3956"/> <source>Application Diagram</source> <translation>Diagramme de l'application</translation> </message> @@ -31801,12 +31811,12 @@ <translation>Système de conrôle des versions (VCS)</translation> </message> <message> - <location filename="Project/Project.py" line="3834"/> + <location filename="Project/Project.py" line="3836"/> <source>Coverage Data</source> <translation>Coverage de données</translation> </message> <message> - <location filename="Project/Project.py" line="3880"/> + <location filename="Project/Project.py" line="3882"/> <source>There is no main script defined for the current project. Aborting</source> <translation>Il n'y a pas de script principal défini dans le projet en cours. Abandon</translation> </message> @@ -31866,17 +31876,17 @@ <translation><b>Ajouter un répertoire...</b><p>Ouvre une fenêtre pour ajouter un répertoire au projet courant.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3855"/> + <location filename="Project/Project.py" line="3857"/> <source>Code Coverage</source> <translation>Code Coverage</translation> </message> <message> - <location filename="Project/Project.py" line="3855"/> + <location filename="Project/Project.py" line="3857"/> <source>Please select a coverage file</source> <translation>Sélectionner un fichier coverage</translation> </message> <message> - <location filename="Project/Project.py" line="3901"/> + <location filename="Project/Project.py" line="3903"/> <source>Please select a profile file</source> <translation>Sélectionner un fichier profile</translation> </message> @@ -32011,7 +32021,7 @@ <translation>Autre</translation> </message> <message> - <location filename="Project/Project.py" line="3954"/> + <location filename="Project/Project.py" line="3956"/> <source>Include module names?</source> <translation>Inclure les noms de modules ?</translation> </message> @@ -32384,7 +32394,7 @@ <translation type="obsolete">Plugin Eric4</translation> </message> <message> - <location filename="Project/Project.py" line="4085"/> + <location filename="Project/Project.py" line="4087"/> <source>Create Package List</source> <translation>Création de la liste de package</translation> </message> @@ -32404,7 +32414,7 @@ <translation type="obsolete"><b>Création de la liste de package</b><p>Cette commande créé la liste des fichiers à inclure dans l'archive d'un plugin eric4. Cette liste est créée à partir du fichier projet.</p></translation> </message> <message> - <location filename="Project/Project.py" line="4245"/> + <location filename="Project/Project.py" line="4247"/> <source>Create Plugin Archive</source> <translation>Création de l'archive du plugin</translation> </message> @@ -32419,7 +32429,7 @@ <translation type="obsolete">Créé le fichier d'archive pour un plugin eric4.</translation> </message> <message> - <location filename="Project/Project.py" line="4058"/> + <location filename="Project/Project.py" line="4060"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation><p>Le fichier <b>PKGLIST</b> existe déjà.</p><p>Ecraser ?</p></translation> </message> @@ -32429,12 +32439,12 @@ <translation type="obsolete"><p>Impossible de créer le fichier <b>PKGLIST</b>.</p><p>Raison: %1</p></translation> </message> <message> - <location filename="Project/Project.py" line="4102"/> + <location filename="Project/Project.py" line="4104"/> <source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source> <translation><p>Le fichier <b>PKGLIST</b> n'existe pas. Abandon...</p></translation> </message> <message> - <location filename="Project/Project.py" line="4110"/> + <location filename="Project/Project.py" line="4112"/> <source>The project does not have a main script defined. Aborting...</source> <translation>Le projet n'a pas de script principal défini. Abandon...</translation> </message> @@ -32729,32 +32739,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4085"/> + <location filename="Project/Project.py" line="4087"/> <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4122"/> + <location filename="Project/Project.py" line="4124"/> <source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4133"/> + <location filename="Project/Project.py" line="4135"/> <source><p>The eric5 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4153"/> + <location filename="Project/Project.py" line="4155"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4165"/> + <location filename="Project/Project.py" line="4167"/> <source><p>The eric5 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4245"/> + <location filename="Project/Project.py" line="4247"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -42084,47 +42094,47 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="314"/> <source>Importing project into Subversion repository</source> <translation>Importer le projet dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="363"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="364"/> <source>Subversion Checkout</source> <translation>'Checkout' Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>L'étiquette doit être une étiquette normale (tags) ou une étiquette de branche (branches). Prière de faire un choix dans la liste.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="385"/> <source>Checking project out of Subversion repository</source> <translation>'Checkout' du projet depuis le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> <source>Subversion Export</source> <translation>'Export' Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="445"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="446"/> <source>Exporting project from Subversion repository</source> <translation>Exporter un projet du référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> <source>Subversion Error</source> <translation>Erreur Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="986"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="987"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>Impossible d'atteindre l'URL du référentiel à partir de la copie locale. Abandon de l'opération d'étiquetage</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1010"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1011"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>Le format de l'URL du référentiel n'est pas valide. Abandon de l'opération d'étiquetage</translation> </message> @@ -42134,12 +42144,12 @@ <translation type="obsolete">Etiquetage de %1 dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1101"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1102"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>Impossible d'atteindre l'URL du référentiel du projet depuis la copie locale. Abandon de l'opération</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>Le format de l'URL du référentiel n'est pas valide. Abandon de l'opération</translation> </message> @@ -42159,7 +42169,7 @@ <translation type="obsolete">Nettoyage de %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1548"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Subversion command</source> <translation>Commande Subversion</translation> </message> @@ -42174,97 +42184,97 @@ <translation type="obsolete">Déplacement de %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1776"/> <source>Subversion Set Property</source> <translation>Propriété Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1794"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1809"/> <source>You have to supply a property name. Aborting.</source> <translation>Vous devez donner un nom à la propriété. Abandon.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1812"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> <source>Subversion Delete Property</source> <translation>Suppression d'une propriété Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1632"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1647"/> <source>Enter property name</source> <translation>Entrer le nom de la propriété</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="530"/> <source>Commiting changes to Subversion repository</source> <translation>'Commiter' les modifications dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="585"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="586"/> <source>Synchronizing with the Subversion repository</source> <translation>Synchronisation avec le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="686"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="687"/> <source>Adding files/directories to the Subversion repository</source> <translation>Ajouter des fichiers/répertoires au référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="785"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="786"/> <source>Adding directory trees to the Subversion repository</source> <translation>Ajouter des arborescences de répertoires dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="820"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> <source>Removing files/directories from the Subversion repository</source> <translation>Supprimer des fichiers/répertoires du réferentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1074"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1075"/> <source>Reverting changes</source> <translation>Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1655"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1670"/> <source>Resolving conficts</source> <translation>Résoudre les confits</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="221"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> <source>Create project in repository</source> <translation>Créer un projet dans le référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="221"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>Impossible de créer le projet dans le référentiel. Peut-être que le référentiel indiqué n'existe pas ou que le serveur ne répond pas.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> <source>New project</source> <translation>Nouveau projet</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>Le projet n'a pu être mis à jour à partir du référentiel.<br />Restauration du contenu initial.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="922"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> <source>Subversion Log</source> <translation>Log Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="922"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> <source>Select number of entries to show.</source> <translation>Sélectionner plusieurs entrées à afficher.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1978"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1993"/> <source>Locking in the Subversion repository</source> <translation>Verrouillage dans le référentiel Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2016"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2031"/> <source>Unlocking in the Subversion repository</source> <translation>Déverrouillage dans le référentiel Subversion</translation> </message> @@ -42281,27 +42291,27 @@ </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1792"/> <source>Property set.</source> <translation>Propriété définie.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1842"/> <source>Property deleted.</source> <translation>Propriété supprimée.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1958"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> <source>Subversion Lock</source> <translation>Verrou Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1958"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> <source>Enter lock comment</source> <translation>Entrer un commentaire pour le verrou</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2076"/> <source>Relocating</source> <translation>Déplacement</translation> </message> @@ -42467,37 +42477,37 @@ <translation type="obsolete">Le processus SVN s'est terminé avec le code de sortie %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="195"/> <source>The svn process did not finish within 30s.</source> <translation>Le processus SVN ne s'est pas terminé dans les 30 dernières secondes.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="196"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="197"/> <source>Could not start the svn executable.</source> <translation>Impossible de lancer l'executable SVN.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> <source>Repository Browser</source> <translation>Navigateur de référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> <source>Enter the repository URL.</source> <translation>Entrer l'URL du référentiel.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2111"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2126"/> <source>Remove from changelist</source> <translation>Supprimer de la liste des modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2162"/> <source>Add to changelist</source> <translation>Ajouter à la liste des modifications:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2137"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2152"/> <source>Enter name of the changelist:</source> <translation>Entrer le nom de la liste des modifications:</translation> </message> @@ -42517,53 +42527,53 @@ <translation></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> <source>The svn process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="882"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="883"/> <source>Moving {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> <source>Tagging {0} in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1148"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1249"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1250"/> <source>Merging {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1512"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1527"/> <source>Cleaning up {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1694"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1709"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="329"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="330"/> <source>Imported revision {0}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="554"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="555"/> <source>Committed revision {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1154"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> <source>Revision {0}. </source> <translation type="unfinished"></translation> @@ -44291,7 +44301,7 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> <source>Resolve conflict</source> - <translation>Résoudre les conflits</translation> + <translation type="obsolete">Résoudre les conflits</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="636"/> @@ -44393,6 +44403,11 @@ <source>Remove from Changelist</source> <translation>Supprimer de la liste des modifications</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> + <source>Conflict resolved</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -44459,415 +44474,415 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>Add to repository</source> - <translation>Ajouter au référentiel</translation> + <translation type="obsolete">Ajouter au référentiel</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>&Add to repository...</source> - <translation>&Ajouter au référentiel...</translation> + <translation type="obsolete">&Ajouter au référentiel...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="92"/> <source>Add the local project to the VCS repository</source> - <translation>Ajoute le projet local au référentiel VCS</translation> + <translation type="obsolete">Ajoute le projet local au référentiel VCS</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="95"/> <source><b>Add to repository</b><p>This adds (imports) the local project to the VCS repository.</p></source> - <translation><b>Ajouter au référentiel</b><p>Ajoute (importe) le projet local au référentiel VCS.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="102"/> + <translation type="obsolete"><b>Ajouter au référentiel</b><p>Ajoute (importe) le projet local au référentiel VCS.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>Remove from repository (and disk)</source> <translation>Supprimer du référentiel (et du disque)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>&Remove from repository (and disk)</source> <translation>&Supprimer du référentiel (et du disque)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="93"/> <source>Remove the local project from the VCS repository (and disk)</source> <translation>Supprime le projet local du référentiel VCS (et du disque)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="109"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="96"/> <source><b>Remove from repository</b><p>This removes the local project from the VCS repository (and disk).</p></source> <translation><b>Suppression du référentiel</b><p>Supprime le projet local du référentiel VCS (et du disque).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> <source>Show log</source> <translation>Afficher le log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> <source>Show &log</source> <translation>Afficher le &log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="121"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="108"/> <source>Show the log of the local project</source> <translation>Affiche le log du projet local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="124"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="111"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Afficher le log</b><p>Affiche le log du projet local</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/> <source>Show difference</source> <translation>Afficher les différences</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/> <source>Show &difference</source> <translation>Afficher les &différences</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/> <source>Show the difference of the local project to the repository</source> <translation>Affiche les différences entre le projet local et le référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="141"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation><b>Afficher les différences</b><p>Affiche les différences du projet local avec le référentiel.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="161"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="148"/> <source>Show difference (extended)</source> <translation>Afficher les différences (étendu)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Affiche les différences entre le référentiel et les différentes révisions du projet</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="155"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation><b>Afficher les différences (etendu)</b><p>Affiche les différences du projet entre différentes révisions.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="177"/> <source>Show status</source> <translation>Afficher l'état (status)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="177"/> <source>Show &status</source> <translation>Affich&er l'état VCS</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="181"/> <source>Show the status of the local project</source> <translation>Affiche l'état du projet local par rapport au référentiel VCS</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Afficher l'état VCS</b><p>Affiche l'état du projet local par rapport au référentiel VCS.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>Tag in repository</source> <translation>Etiqueter au niveau du référentiel (tag)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>&Tag in repository...</source> <translation>&Etiqueter dans le référentiel...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> <source>Tag the local project in the repository</source> <translation>Etiquette le projet local dans le référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Etiqueter dans le référentiel</b><p>Etiquette le projet local dans le référentiel (opération "tag").</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> <source>Export from repository</source> <translation>Exporter du référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> <source>&Export from repository...</source> <translation>&Exporter du référentiel...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="224"/> + <source>Export a project from the repository</source> + <translation>Exporte un projet d'un référentiel VCS</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="227"/> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>Exporter du référentiel</b><p>Exporte un projet d'un référentiel VCS.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <source>Command options</source> + <translation>Options de commande</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <source>Command &options...</source> + <translation>&Options de commande...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> - <source>Export a project from the repository</source> - <translation>Exporte un projet d'un référentiel VCS</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="240"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation><b>Exporter du référentiel</b><p>Exporte un projet d'un référentiel VCS.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> - <source>Command options</source> - <translation>Options de commande</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> - <source>Command &options...</source> - <translation>&Options de commande...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="250"/> <source>Show the VCS command options</source> <translation>Affiche les options de commandes VCS</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="251"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> <translation><b>Options de commandes...</b><p>Affiche une boite de dialogue pour éditer les options de commandes VCS</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Revert changes</source> <translation>Revenir avant les modifications</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Re&vert changes</source> <translation>&Recharger le projet</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> <source>Revert all changes made to the local project</source> <translation>Recharger le projet et écraser toutes les modifications locales</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="265"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Recharger le projet</b><p>Recharge le projet et écrase toutes les modifications effectuées localement.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> <source>Merge</source> <translation>Fusionner</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> <source>Mer&ge changes...</source> <translation>&Fusionner les modifications...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="263"/> <source>Merge changes of a tag/revision into the local project</source> <translation>Fusionner les modifications d'une révision avec le projet local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="279"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Fusionner</b><p>Fusionner les modifications d'une révision avec le projet local</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> <source>Switch</source> <translation>Basculer de version</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> <source>S&witch...</source> <translation>&Basculer de version...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> <source>Switch the local copy to another tag/branch</source> <translation>Bascule de la copie locale vers une autre branche/étiquette</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>Basculer de version</b><p>Bascule de la copie locale vers une autre branche/étiquette.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Resolve conflicts</source> - <translation>Résoudre les confits</translation> + <translation type="obsolete">Résoudre les confits</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Resolve con&flicts</source> - <translation>Résoudre les con&fits</translation> + <translation type="obsolete">Résoudre les con&fits</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> <source>Resolve all conflicts of the local project</source> - <translation>Résout tous les conflits du projet local</translation> + <translation type="obsolete">Résout tous les conflits du projet local</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> - <translation><b>Résolution des conflits</b><p>Résout tous les conflits VCS du projet local.</p></translation> + <translation type="obsolete"><b>Résolution des conflits</b><p>Résout tous les conflits VCS du projet local.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <source>Cleanup</source> + <translation>Nettoyer</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <source>Cleanu&p</source> + <translation>&Nettoyer</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> + <source>Cleanup the local project</source> + <translation>Nettoyer le projet local</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Nettoyer</b><p>Permet de nettoyer le projet local.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> - <source>Cleanup</source> - <translation>Nettoyer</translation> + <source>Execute command</source> + <translation>Exécuter une commande</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> - <source>Cleanu&p</source> - <translation>&Nettoyer</translation> + <source>E&xecute command...</source> + <translation>E&xécuter une commande...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> - <source>Cleanup the local project</source> - <translation>Nettoyer le projet local</translation> + <source>Execute an arbitrary VCS command</source> + <translation>Exécuter une commande VCS arbitraire</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Nettoyer</b><p>Permet de nettoyer le projet local.</p></translation> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> + <translation><b>Exécuter une commande</b><p>Ouvre une boite de dialogue pour exécuter une commande VCS arbitraire.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> - <source>Execute command</source> - <translation>Exécuter une commande</translation> + <source>List tags</source> + <translation>Lister les étiquettes</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> - <source>E&xecute command...</source> - <translation>E&xécuter une commande...</translation> + <source>List tags...</source> + <translation>Lister les étiquettes...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> - <source>Execute an arbitrary VCS command</source> - <translation>Exécuter une commande VCS arbitraire</translation> + <source>List tags of the project</source> + <translation>Liste les étiquettes du projet</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> - <translation><b>Exécuter une commande</b><p>Ouvre une boite de dialogue pour exécuter une commande VCS arbitraire.</p></translation> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Liste des étiquettes</b><p>Liste les étiquettes du projet.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> - <source>List tags</source> - <translation>Lister les étiquettes</translation> + <source>List branches</source> + <translation>Lister les branches</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> - <source>List tags...</source> - <translation>Lister les étiquettes...</translation> + <source>List branches...</source> + <translation>Lister les branches...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> - <source>List tags of the project</source> - <translation>Liste les étiquettes du projet</translation> + <source>List branches of the project</source> + <translation>Liste les branches du projet</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>Liste des étiquettes</b><p>Liste les étiquettes du projet.</p></translation> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Liste des branches</b><p>Effectue la liste de toutes les branches de développement du projet.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> - <source>List branches</source> - <translation>Lister les branches</translation> + <source>List repository contents</source> + <translation>Listing du référentiel</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> - <source>List branches...</source> - <translation>Lister les branches...</translation> + <source>List repository contents...</source> + <translation>Listing du référentiel...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> - <source>List branches of the project</source> - <translation>Liste les branches du projet</translation> + <source>Lists the contents of the repository</source> + <translation>Liste le contenu du référentiel</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Liste des branches</b><p>Effectue la liste de toutes les branches de développement du projet.</p></translation> + <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> + <translation><b>Listing du référentiel</b><p>Cette liste affiche le contenu du référentiel.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> - <source>List repository contents</source> - <translation>Listing du référentiel</translation> + <source>Set Property</source> + <translation>Définir une propriété</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> - <source>List repository contents...</source> - <translation>Listing du référentiel...</translation> + <source>Set Property...</source> + <translation>Définir une propriété...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> - <source>Lists the contents of the repository</source> - <translation>Liste le contenu du référentiel</translation> + <source>Set a property for the project files</source> + <translation>Définit une propriété pour les fichiers projets</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> - <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> - <translation><b>Listing du référentiel</b><p>Cette liste affiche le contenu du référentiel.</p></translation> + <source><b>Set Property</b><p>This sets a property for the project files.</p></source> + <translation><b>Propriétés</b><p>Définition des propritétés du projet</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> - <source>Set Property</source> - <translation>Définir une propriété</translation> + <source>List Properties</source> + <translation>Lister les propriétés</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> - <source>Set Property...</source> - <translation>Définir une propriété...</translation> + <source>List Properties...</source> + <translation>Lister les propriétés...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> - <source>Set a property for the project files</source> - <translation>Définit une propriété pour les fichiers projets</translation> + <source>List properties of the project files</source> + <translation>Liste des propriétés des fichiers projets</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> - <source><b>Set Property</b><p>This sets a property for the project files.</p></source> - <translation><b>Propriétés</b><p>Définition des propritétés du projet</p></translation> + <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> + <translation><b>Liste des proprtiétés</b><p>Liste des propriétés des fichiers projets.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> - <source>List Properties</source> - <translation>Lister les propriétés</translation> + <source>Delete Property</source> + <translation>Supprimer une propriété</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> - <source>List Properties...</source> - <translation>Lister les propriétés...</translation> + <source>Delete Property...</source> + <translation>Supprimer une propriété...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> - <source>List properties of the project files</source> - <translation>Liste des propriétés des fichiers projets</translation> + <source>Delete a property for the project files</source> + <translation>Suppression d'une propriété pour les fichiers projets</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> - <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> - <translation><b>Liste des proprtiétés</b><p>Liste des propriétés des fichiers projets.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> - <source>Delete Property</source> - <translation>Supprimer une propriété</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> - <source>Delete Property...</source> - <translation>Supprimer une propriété...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> - <source>Delete a property for the project files</source> - <translation>Suppression d'une propriété pour les fichiers projets</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="410"/> <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> <translation><b>Supprimer une propriété</b><p>Supprime une propriété des fichiers projets.</p></translation> </message> @@ -44887,110 +44902,130 @@ <translation type="obsolete"><b>Afficher un log limité</b><p>Affiche le log du projet limité aux entrées sélectionnées</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="204"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> <source>Show repository info</source> <translation>Affiche les infos du référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="208"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> <source>Show some repository related information for the local project</source> <translation>Affiche les informations du référentiel en rapport avec le projet local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> <source>Relocate</source> <translation>Déplacer</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> <source>Relocate...</source> <translation>Déplacer...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="408"/> <source>Relocate the working copy to a new repository URL</source> <translation>Recopie une copie de travail vers une nouvelle URL de référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="424"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="411"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>Relocaliser</b><p>Redéfinit une URL de référentiel pour la copie courante.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation><b>Afficher les infos du référentiel</b><p>Affiche les informations du référentiel en rapport avec le projet local.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="175"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="162"/> <source>Show difference (URLs)</source> <translation>Afficher les différences (URLs)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="166"/> <source>Show the difference of the project between two repository URLs</source> <translation>Affiche les différence du projet entre deux référentiels (URLs)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> <source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source> <translation><b>Affiche les différences (URLs)</b><p>Affiche les différences du projet entre deux référentiels indiqués par leurs URLs.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="118"/> <source>Show log browser</source> <translation>Afficher le navigateur de logs</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/> <source>Show a dialog to browse the log of the local project</source> <translation>Affiche une fenêtre permettant de parcourir les logs du projet local</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="125"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Navigateur de logs</b><p>Affiche une fenêtre permettant de parcourir les messages logs du projet local. La fenêtre n'affiche qu'un nombre limité d'entrées, mais un bouton permet d'afficher les logs plus anciens.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> <source>Repository Browser</source> <translation>Navigateur de référentiel</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> <source>Repository Browser...</source> <translation>Navigateur de référentiel...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <source>Show the Repository Browser dialog</source> + <translation>Affiche la fenêtre de navigation du référentiel</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation><b>Navigateur de référentiel</b><p>Affiche la fenêtre de navigation du référentiel.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <source>Configure</source> + <translation>Configuration</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <source>Configure...</source> + <translation>Configuration...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> - <source>Show the Repository Browser dialog</source> - <translation>Affiche la fenêtre de navigation du référentiel</translation> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation>Afficher la page de configuration avec la page Subversion sélectionnée</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation><b>Navigateur de référentiel</b><p>Affiche la fenêtre de navigation du référentiel.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> - <source>Configure</source> - <translation>Configuration</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> - <source>Configure...</source> - <translation>Configuration...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> - <source>Show the configuration dialog with the Subversion page selected</source> - <translation>Afficher la page de configuration avec la page Subversion sélectionnée</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation><b>Configuration</b><p>Affiche la page de configuration avec la page Subversion sélectionnée.</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnPropDelDialog</name> @@ -54519,7 +54554,7 @@ <context> <name>VersionControl</name> <message> - <location filename="VCS/VersionControl.py" line="536"/> + <location filename="VCS/VersionControl.py" line="547"/> <source>Process Generation Error</source> <translation>Erreur du processus</translation> </message> @@ -54529,12 +54564,12 @@ <translation type="obsolete">Impossible de lancer le processus %1. Assurez-vous qu'il est bien dans le chemin de recherche.</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="662"/> + <location filename="VCS/VersionControl.py" line="673"/> <source>Repository status checking is switched off</source> <translation>La vérification de statut du référentiel est désactivée</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="536"/> + <location filename="VCS/VersionControl.py" line="547"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -58481,30 +58516,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1236"/> <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="1719"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1733"/> <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="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1741"/> <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="1238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1252"/> <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="1268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -58515,23 +58550,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> <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="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> <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="1731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1745"/> <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="1734"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/> <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> @@ -58539,7 +58574,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -58789,7 +58824,7 @@ en cours</b></td><td>%3</td></tr><tr><td><b>Version "commitée"</b></td><td>%4</td></tr><tr><td><b>Date du commit</b></td><td>%5</td></tr><tr><td><b>Heure du commit</b></td><td>%6</td></tr><tr><td><b>Dernier auteur</b></td><td>%7</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1589"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1604"/> <source>unknown</source> <translation>inconnu</translation> </message> @@ -58799,12 +58834,12 @@ <translation type="obsolete"><h3>Informations sur le référentiel</h3><table><tr><td><b>PySvn V.</b></td><td>%1</td></tr><tr><td><b>Subversion V.</b></td><td>%2</td></tr><tr><td><b>API Subversion V.</b></td><td>%3</td></tr><tr><td><b>URL</b></td><td>%4</td></tr><tr><td><b>Révision actuelle</b></td><td>%5</td></tr><tr><td><b>Révision validée</b></td><td>%6</td></tr><tr><td><b>Date de validation</b></td><td>%7</td></tr><tr><td><b>Heure de validation</b></td><td>%8</td></tr><tr><td><b>Dernier auteur</b></td><td>%9</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1458"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1473"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1590"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation type="unfinished"></translation> </message>
--- a/i18n/eric5_it.ts Mon May 28 15:59:36 2012 +0200 +++ b/i18n/eric5_it.ts Tue May 29 20:59:40 2012 +0200 @@ -16733,42 +16733,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/> <source>The hg process finished with the exit code {0}</source> <translation>Il processo hg è terminato con codice di uscita {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="252"/> - <source>The hg process did not finish within 30s.</source> - <translation>Il processo hg non è finito entro i 30s.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="254"/> + <source>The hg process did not finish within 30s.</source> + <translation>Il processo hg non è finito entro i 30s.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="256"/> <source>Could not start the hg executable.</source> <translation>Non posso avviare l'eseguibile hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> <source>Create project repository</source> <translation>Crea il repository del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> <source>The project repository could not be created.</source> <translation>Il repository del progetto non può essere creato.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="310"/> <source>Creating Mercurial repository</source> <translation>Creazione repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="325"/> <source>Initial commit to Mercurial repository</source> <translation>Commit iniziale nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="369"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="371"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonazione del progetto dal repository Mercurial</translation> </message> @@ -16778,47 +16778,47 @@ <translation type="obsolete">Commit delle modifiche nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="533"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizzazione con il repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="585"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Aggiunta di file/directory al repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="647"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="649"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Rimozione di file/directory dal repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/> <source>Renaming {0}</source> <translation>Rinomino {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="840"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="842"/> <source>Taging in the Mercurial repository</source> <translation>Creazione tag nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="873"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="875"/> <source>Reverting changes</source> <translation>Annullamento modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="925"/> <source>Merging</source> <translation>Merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1176"/> <source>Mercurial command</source> <translation>Comando Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1352"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> @@ -16833,192 +16833,192 @@ <translation type="obsolete">Mostra il numero di elementi da mostrare.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1597"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1611"/> <source>Pulling from a remote Mercurial repository</source> <translation>Pulling da un repository Mercurial remoto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1650"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> <source>Pushing to a remote Mercurial repository</source> <translation>Pushing in un repository Mercurial remoto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Resolving files/directories</source> <translation>Risoluzione di file/directory</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> <source>Create Branch</source> <translation>Creazione Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> <source>Enter branch name</source> <translation>Inserisci il nome del Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> <source>Creating branch in the Mercurial repository</source> <translation>Creazione Branch nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1882"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Verifica dell'integrità del repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Showing the combined configuration settings</source> <translation>Visualizzazione combinata della impostazioni di configurazione</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Showing aliases for remote repositories</source> <translation>Visualizzazione degli alias per i repository remoti</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> <source>Shall the working directory be updated?</source> <translation>Le directory di lavoro devono essere aggiornate ?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1839"/> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1976"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Il file <b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2305"/> <source>Removing files from the Mercurial repository only</source> <translation>Rimozione di file dal solo repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2185"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Changegroup Files (*.hg);;All Files (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <source>Identifying changegroup file</source> <translation>Identifica i file changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file changegroup di Mercurial<b>{0}</b> esiste già. Sovrascriverlo ?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2367"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2381"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="479"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="481"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -19610,7 +19610,7 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> <source>Resolve conflict</source> - <translation>Risolvi conflitti</translation> + <translation type="obsolete">Risolvi conflitti</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> @@ -19647,6 +19647,11 @@ <source>Do you really want to remove these files from the repository?</source> <translation>Vuoi veramente rimuovere questi file dal repository ?</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> + <source>Conflict resolved</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -19793,60 +19798,60 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Add to repository</source> - <translation>Aggiungi al repository</translation> + <translation type="obsolete">Aggiungi al repository</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>&Add to repository...</source> - <translation>&Aggiungi al repository...</translation> + <translation type="obsolete">&Aggiungi al repository...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="225"/> <source>Add the local project to the repository</source> - <translation>Aggiungi il progetto locale al repository</translation> + <translation type="obsolete">Aggiungi il progetto locale al repository</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228"/> <source><b>Add to repository</b><p>This adds (imports) the local project to the repository.</p></source> - <translation><b>Aggiungi al repository</b><p>Aggiunte (imports) il progetto locate la repository.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <translation type="obsolete"><b>Aggiungi al repository</b><p>Aggiunte (imports) il progetto locate la repository.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Remove from repository (and disk)</source> <translation>Rimuovi dal repository (e dal disco)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>&Remove from repository (and disk)</source> <translation>&Rimuovi dal repository (e dal disco)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="239"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> <source>Remove the local project from the repository (and disk)</source> <translation>Rimuovi il progetto locate dal repository (e dal disco)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> <source><b>Remove from repository</b><p>This removes the local project from the repository (and disk).</p></source> <translation><b>Rimuovi dal repository</b><p>Rimuove il progetto locale dal repository (e dal disco).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Show log</source> <translation>Mostra log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Show &log</source> <translation>Mostra &log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241"/> <source>Show the log of the local project</source> <translation>Mostra i log del progetto locale</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="257"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="244"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Mostra log</b><p>Mostra i log del progetto locale.</p></translation> </message> @@ -19866,372 +19871,372 @@ <translation type="obsolete"><b>Mostra log ridotto</b><p>Mostra il log del progetto locale limitato ad un numero selezionabile di elementi.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>Show log browser</source> <translation>Mostra il browser dei log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="255"/> <source>Show a dialog to browse the log of the local project</source> <translation>Mostra un dialogo per navigare i log del progetto locale</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation><b>Mostra borwser log</b><p>Mostra un dialogo per navigare i log del progetto locale. Inizialmente viene mostrato un numero limitato di elementi. Altri possono essere scaricati in seguito.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> + <source>Show difference</source> + <translation>Mostra differenza</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> + <source>Show &difference</source> + <translation>Mostra &differenza</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> - <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> - <translation><b>Mostra borwser log</b><p>Mostra un dialogo per navigare i log del progetto locale. Inizialmente viene mostrato un numero limitato di elementi. Altri possono essere scaricati in seguito.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> - <source>Show difference</source> - <translation>Mostra differenza</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> - <source>Show &difference</source> - <translation>Mostra &differenza</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> <source>Show the difference of the local project to the repository</source> <translation>Mostra le differenze tra il progetto locale e il repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation><b>Mostra differenze</b><p>Mostra le differenze tra il progetto locale e il repository.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> <source>Show difference (extended)</source> <translation>Mostra differenza (esteso)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Mostra le differenze tra la revisione del progetto e il repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation><b>Mostra differenze (esteso)</b><p>Mostra le differenze di una revisione selezionabile del progetto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show status</source> <translation>Mostra stato</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show &status</source> <translation>Mostra &stato</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> + <source>Show the status of the local project</source> + <translation>Mostra lo stato del progetto locale</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation><b>Mostra stato</b><p>Mostra lo stato del progetto locale.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <source>Show heads</source> + <translation>Mostra head</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> - <source>Show the status of the local project</source> - <translation>Mostra lo stato del progetto locale</translation> + <source>Show the heads of the repository</source> + <translation>Mostra head del repository</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation><b>Mostra stato</b><p>Mostra lo stato del progetto locale.</p></translation> + <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> + <translation><b>Mostra head</b><p>Mostra l'head del repository.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> - <source>Show heads</source> - <translation>Mostra head</translation> + <source>Show parents</source> + <translation>Mostra predecessori</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> - <source>Show the heads of the repository</source> - <translation>Mostra head del repository</translation> + <source>Show the parents of the repository</source> + <translation>Mostra il predecessori del repository</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="328"/> - <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> - <translation><b>Mostra head</b><p>Mostra l'head del repository.</p></translation> + <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> + <translation><b>Mostra predecessori</b><p>Mostra i predecessori del repository.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> - <source>Show parents</source> - <translation>Mostra predecessori</translation> + <source>Show tip</source> + <translation>Mostra tip</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> - <source>Show the parents of the repository</source> - <translation>Mostra il predecessori del repository</translation> + <source>Show the tip of the repository</source> + <translation>Mostra il tip del repository</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="341"/> - <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> - <translation><b>Mostra predecessori</b><p>Mostra i predecessori del repository.</p></translation> + <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> + <translation><b>Mostra tip</b><p>Mostra il tip del repository.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> + <source>Revert changes</source> + <translation>Annulla modifiche</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> - <source>Show tip</source> - <translation>Mostra tip</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="351"/> - <source>Show the tip of the repository</source> - <translation>Mostra il tip del repository</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/> - <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> - <translation><b>Mostra tip</b><p>Mostra il tip del repository.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> - <source>Revert changes</source> - <translation>Annulla modifiche</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Re&vert changes</source> <translation>In&verti modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/> <source>Revert all changes made to the local project</source> <translation>Inverti tutte le modifiche fatte al progetto locale</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Inverti modifiche</b><p>Inverte tutte le modifiche fatte al progetto locale.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Merge</source> <translation>Fondi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Mer&ge changes...</source> <translation>Fon&di modifiche...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> <source>Merge changes of a revision into the local project</source> <translation>Fondi le modifiche dela revisione nel progetto locale</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Merge</b><p>Fonde le modifiche della revisione nel progetto locale.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve conflicts</source> - <translation>Risolvi conflitti</translation> + <translation type="obsolete">Risolvi conflitti</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve con&flicts</source> - <translation>Risolvi con&flitti</translation> + <translation type="obsolete">Risolvi con&flitti</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="392"/> <source>Resolve all conflicts of the local project</source> - <translation>Risolvi tutti i conflitti del progetto locale</translation> + <translation type="obsolete">Risolvi tutti i conflitti del progetto locale</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> - <translation><b>Risolve conflitti</b><p>Risolve tutti i conflitti del progetto locale.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> + <translation type="obsolete"><b>Risolve conflitti</b><p>Risolve tutti i conflitti del progetto locale.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Tag in repository</source> <translation>Tag nel repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>&Tag in repository...</source> <translation>&Tag nel repository...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> + <source>Tag the local project in the repository</source> + <translation>Tag del progetto locale nel repository</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Tag nel repository</b><p>Tag del progetto locale nel repository.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <source>List tags</source> + <translation>Elenca tag</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <source>List tags...</source> + <translation>Elenca tag...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> - <source>Tag the local project in the repository</source> - <translation>Tag del progetto locale nel repository</translation> + <source>List tags of the project</source> + <translation>Elenca i tag del progetto</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="409"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Tag nel repository</b><p>Tag del progetto locale nel repository.</p></translation> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Elenca tag</b><p>Elenca i tag del progetto.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>List tags</source> - <translation>Elenca tag</translation> + <source>List branches</source> + <translation>Elenca branches</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>List tags...</source> - <translation>Elenca tag...</translation> + <source>List branches...</source> + <translation>Elenca branches...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> - <source>List tags of the project</source> - <translation>Elenca i tag del progetto</translation> + <source>List branches of the project</source> + <translation>Elenca i branches del progetto</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>Elenca tag</b><p>Elenca i tag del progetto.</p></translation> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Elenca branches</b><p>Elenca i branch del progetto.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source>List branches</source> - <translation>Elenca branches</translation> + <source>Create branch</source> + <translation>Crea Branch</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source>List branches...</source> - <translation>Elenca branches...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/> - <source>List branches of the project</source> - <translation>Elenca i branches del progetto</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Elenca branches</b><p>Elenca i branch del progetto.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> - <source>Create branch</source> - <translation>Crea Branch</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> <source>Create &branch...</source> <translation>Crea &Branch...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> <source>Create a new branch for the local project in the repository</source> <translation>Crea un nuovo branch per il progetto locale nel repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Crea Branch</b><p>Crea un nuovo branch per il progetto locate nel repository.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> <source>Close branch</source> <translation>Chiudi branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> <source>Close the current branch of the local project</source> <translation>Chiudi il branch corrente del progetto locale</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Chiudi branch</b><p>Chiude il branch corrente del progetto locale.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source>Switch</source> <translation>Switch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source>S&witch...</source> <translation>S&witch...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> + <source>Switch the working directory to another revision</source> + <translation>Switch della directory di lavoro ad un'altra revisione</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="491"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation><b>Switch</b><p>Switch della directory di lavoro ad un'altra revisione.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <source>Cleanup</source> + <translation>Pulisci</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <source>Cleanu&p</source> + <translation>&Pulisci</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> - <source>Switch the working directory to another revision</source> - <translation>Switch della directory di lavoro ad un'altra revisione</translation> + <source>Cleanup the local project</source> + <translation>Pulisci il progetto locale</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> - <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> - <translation><b>Switch</b><p>Switch della directory di lavoro ad un'altra revisione.</p></translation> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Pulizia</b><p>Esegue la pulizia del progetto locale.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> - <source>Cleanup</source> - <translation>Pulisci</translation> + <source>Execute command</source> + <translation>Esegui comando</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> - <source>Cleanu&p</source> - <translation>&Pulisci</translation> + <source>E&xecute command...</source> + <translation>&Esegui comando...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> - <source>Cleanup the local project</source> - <translation>Pulisci il progetto locale</translation> + <source>Execute an arbitrary Mercurial command</source> + <translation>Esegui un comando Mercurial arbitrario</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Pulizia</b><p>Esegue la pulizia del progetto locale.</p></translation> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> + <translation><b>Esegui comando</b><p>Apre un dialogo per inserire un comando Mercurial arbitraio.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> - <source>Execute command</source> - <translation>Esegui comando</translation> + <source>Command options</source> + <translation>Opzione comando</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> - <source>E&xecute command...</source> - <translation>&Esegui comando...</translation> + <source>Command &options...</source> + <translation>&Opzioni comando...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>Execute an arbitrary Mercurial command</source> - <translation>Esegui un comando Mercurial arbitrario</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> - <translation><b>Esegui comando</b><p>Apre un dialogo per inserire un comando Mercurial arbitraio.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> - <source>Command options</source> - <translation>Opzione comando</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> - <source>Command &options...</source> - <translation>&Opzioni comando...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>Show the Mercurial command options</source> <translation>Mostra le opzioni del comando Mercurial</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> + <translation><b>Opzioni comando...</b><p>Mostra un dialogo per modificare le opzioni del comando Mercurial.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Configure</source> + <translation>Configura</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Configure...</source> + <translation>Configura...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <source>Show the configuration dialog with the Mercurial page selected</source> + <translation>Mostra il dialogo di configurazione con la pagina di Mercurial selezionata</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> - <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> - <translation><b>Opzioni comando...</b><p>Mostra un dialogo per modificare le opzioni del comando Mercurial.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> - <source>Configure</source> - <translation>Configura</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> - <source>Configure...</source> - <translation>Configura...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> - <source>Show the configuration dialog with the Mercurial page selected</source> - <translation>Mostra il dialogo di configurazione con la pagina di Mercurial selezionata</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Configura</b><p>Mostra il dialogo di configurazione con la pagina di Mercurial selezionata.</p></translation> </message> @@ -20276,177 +20281,177 @@ <translation type="obsolete"><b>Mostra configurazioni combinate</b><p>Mostra configurazioni combinate da tutti i file di configurazione.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> <source>Show paths</source> <translation>Mostra percorsi</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <source>Show paths...</source> + <translation>Mostra percorsi...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <source>Show the aliases for remote repositories</source> + <translation>Mostra alias per i repository remoti</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation><b>Mostra percorsi</b><p>Mostra alias per i repository remoti.</p></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> - <source>Show paths...</source> - <translation>Mostra percorsi...</translation> + <source>Verify repository</source> + <translation>Verifica repository</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <source>Verify repository...</source> + <translation>Verifica repository...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> - <source>Show the aliases for remote repositories</source> - <translation>Mostra alias per i repository remoti</translation> + <source>Verify the integrity of the repository</source> + <translation>Verifica l'integrità del repository</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation><b>Mostra percorsi</b><p>Mostra alias per i repository remoti.</p></translation> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation><b>Verifica repository</b><p>Verifica l'integrità del repository.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Verify repository</source> - <translation>Verifica repository</translation> + <source>Recover</source> + <translation>Recover</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Verify repository...</source> - <translation>Verifica repository...</translation> + <source>Recover...</source> + <translation>Recover...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> - <source>Verify the integrity of the repository</source> - <translation>Verifica l'integrità del repository</translation> + <source>Recover from an interrupted transaction</source> + <translation>Recupera da una transazione interrotta</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> - <translation><b>Verifica repository</b><p>Verifica l'integrità del repository.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> - <source>Recover</source> - <translation>Recover</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> - <source>Recover...</source> - <translation>Recover...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> - <source>Recover from an interrupted transaction</source> - <translation>Recupera da una transazione interrotta</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Recover</b><p>Recupera da una transazione interrotta.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Repository Administration</source> <translation>Amministrazione repository</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <source>Create .hgignore</source> + <translation>Crea .hgignore</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <source>Create a .hgignore file with default values</source> + <translation>Crea una file .hgignore con i valori di default</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation><b>Crea .hgignore</b><p>Crea una file .hgignore con i valori di default.</p></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> - <source>Create .hgignore</source> - <translation>Crea .hgignore</translation> + <source>Create changegroup</source> + <translation>Crea changegroup</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <source>Create changegroup...</source> + <translation>Crea changegroup...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> - <source>Create a .hgignore file with default values</source> - <translation>Crea una file .hgignore con i valori di default</translation> + <source>Create changegroup file collecting changesets</source> + <translation>Crea un file changegroup che colleziona i changeset</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> + <source>Apply changegroups</source> + <translation>Applica changegroups</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <source>Apply changegroups...</source> + <translation>Applica changegroups...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> + <source>Apply one or several changegroup files</source> + <translation>Applica una o più file changegroups</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> + <source>Changegroup Management</source> + <translation>Changegroup Management</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation><b>Crea .hgignore</b><p>Crea una file .hgignore con i valori di default.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Create changegroup</source> - <translation>Crea changegroup</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Create changegroup...</source> - <translation>Crea changegroup...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> - <source>Create changegroup file collecting changesets</source> - <translation>Crea un file changegroup che colleziona i changeset</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> - <source>Apply changegroups</source> - <translation>Applica changegroups</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> - <source>Apply changegroups...</source> - <translation>Applica changegroups...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> - <source>Apply one or several changegroup files</source> - <translation>Applica una o più file changegroups</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> - <source>Changegroup Management</source> - <translation>Changegroup Management</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Crea changegroup</b><p>Crea un file changegroup che colleziona i changeset (hg bundle).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Applica changegroups</b><p>Applica una o più file changegroups generati dall'azione Create changegroup' action (hg unbundle).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source>Show current branch</source> <translation>Mostra branch corrente</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> <source>Show the current branch of the project</source> <translation>Mostra il brach corrente del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Mostra il branch corrente</b><p>Mostra il branch corrente del progetto.</p></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Mark as "good"</source> + <translation>Segna come "good"</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <source>Mark a selectable changeset as good</source> + <translation>Segna un chageset selezionabile come good</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation><b>Segna come "good"</b><p>Segna un chageset selezionabile come good.</p></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> - <source>Mark as "good"</source> - <translation>Segna come "good"</translation> + <source>Mark as "bad"</source> + <translation>Segna come "bad"</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> - <source>Mark a selectable changeset as good</source> - <translation>Segna un chageset selezionabile come good</translation> + <source>Mark a selectable changeset as bad</source> + <translation>Segna un chageset selezionabile come bad</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation><b>Segna come "good"</b><p>Segna un chageset selezionabile come good.</p></translation> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation><b>Segna come bad</b><p>Segna un chageset selezionabile come bad.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Mark as "bad"</source> - <translation>Segna come "bad"</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> - <source>Mark a selectable changeset as bad</source> - <translation>Segna un chageset selezionabile come bad</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> - <translation><b>Segna come bad</b><p>Segna un chageset selezionabile come bad.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source>Skip</source> <translation>Salta</translation> </message> @@ -20461,107 +20466,107 @@ <translation type="obsolete"><b>Skip</b><p>Salta il changest corrente.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source>Reset</source> <translation>Resetta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Reset the bisect search data</source> <translation>Reset dei dati di ricerca bisect</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Reset</b><p>Reset dei dati di ricerca bisect.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source>Bisect</source> <translation>Bisect</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Mark as "good"...</source> + <translation>Segna come "good"...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> - <source>Mark as "good"...</source> - <translation>Segna come "good"...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"...</source> <translation>Segna come "bad"...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Preview changegroup...</source> <translation>Anteprima changegroup...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Identify</source> <translation>Identify</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Identify...</source> <translation>Identify...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> <source>Identify the project directory</source> <translation>Identifica la directory del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Identify</b><p>Identifica la directory del progetto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="671"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Anteprima di un file changegroup contenente una collezione di changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Anteprima changegroup</b><p>Anteprima di un file changegroup contenente una collezione di changeset.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Identify changegroup</source> <translation>Identifica changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Identify changegroup...</source> <translation>Identifica changegroup...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation>Identifica un changegroup contenente una collezione di changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation><b>Identifica changegroup</b><p>Identifica un changegroup contenente una collezione di changeset.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Back out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Back out changes of an earlier changeset</source> <translation>Ritiro changeset di un changeset precedente</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation></b>Ritiro changeset</b><p>Ritiro changeset di un changeset precedente.</p></translation> </message> @@ -20581,260 +20586,280 @@ <translation><b>Push modifiche (force)</b><p>Esegue il push delle modifche dal repository locale verso uno remoto usando l'opzione 'force'.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Serve project repository</source> <translation>Servi repository del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Serve project repository...</source> <translation>Servi repository del progetto...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/> <source>Serve the project repository</source> <translation>Servi il repository del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Servi repository del progetto</b><p>Rende disponibile il repository del progetto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> <source>Specials</source> <translation>Speciali</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> <source>The project should be reread. Do this now?</source> <translation>Il progetto deve essere riletto. Farlo ora ?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care.</strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> + <source>Show an editor to edit the user configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit user configuration</source> + <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit user configuration...</source> + <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> - <source>Show an editor to edit the user configuration file</source> + <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Edit repository configuration</source> + <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> - <source>Show an editor to edit the repository configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="578"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1311"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Import Patch...</source> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> - <source>Import a patch from a patch file</source> + <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> - <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> - <source>Patch Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344"/> - <source>Revert Changes</source> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> - <source>Export Patches</source> + <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> - <source>Export Patches...</source> + <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/> - <source>Export revisions to patch files</source> + <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> - <source>Change Phase...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> - <source>Change the phase of revisions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1349"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856"/> + <source>Copies changesets from another branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> - <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -29674,7 +29699,7 @@ <translation><b>Analisi codice...</b><p>Mostra le analisi del codice di tutti i file Python nel progetto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3901"/> + <location filename="Project/Project.py" line="3903"/> <source>Profile Data</source> <translation>Profilazione dati</translation> </message> @@ -29694,7 +29719,7 @@ <translation><b>Profilazione dati...</b><p>Mostra la profilazione dei dati per il progetto.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3954"/> + <location filename="Project/Project.py" line="3956"/> <source>Application Diagram</source> <translation>Diagrammi dell'applicazione</translation> </message> @@ -29759,12 +29784,12 @@ <translation>Version Control System</translation> </message> <message> - <location filename="Project/Project.py" line="3834"/> + <location filename="Project/Project.py" line="3836"/> <source>Coverage Data</source> <translation>Dati Analisi</translation> </message> <message> - <location filename="Project/Project.py" line="3880"/> + <location filename="Project/Project.py" line="3882"/> <source>There is no main script defined for the current project. Aborting</source> <translation>Non c'è uno script principale definito per il progetto. Esco</translation> </message> @@ -29824,17 +29849,17 @@ <translation><b>Aggiungi directory...</b><p>Apre un dialogo per aggiungere una directory al progetto corrente.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3855"/> + <location filename="Project/Project.py" line="3857"/> <source>Code Coverage</source> <translation>Analisi codice</translation> </message> <message> - <location filename="Project/Project.py" line="3855"/> + <location filename="Project/Project.py" line="3857"/> <source>Please select a coverage file</source> <translation>Per favore seleziona un file per l'analisi</translation> </message> <message> - <location filename="Project/Project.py" line="3901"/> + <location filename="Project/Project.py" line="3903"/> <source>Please select a profile file</source> <translation>Per favore seleziona un file per la profilazione</translation> </message> @@ -29879,7 +29904,7 @@ <translation>Altro</translation> </message> <message> - <location filename="Project/Project.py" line="3954"/> + <location filename="Project/Project.py" line="3956"/> <source>Include module names?</source> <translation>Includi i nomi dei moduli ?</translation> </message> @@ -30137,7 +30162,7 @@ </translation> </message> <message> - <location filename="Project/Project.py" line="4085"/> + <location filename="Project/Project.py" line="4087"/> <source>Create Package List</source> <translation>Crea lista del package</translation> </message> @@ -30147,7 +30172,7 @@ <translation>Crea lista del &package</translation> </message> <message> - <location filename="Project/Project.py" line="4245"/> + <location filename="Project/Project.py" line="4247"/> <source>Create Plugin Archive</source> <translation>Crea un archivio per il plugin</translation> </message> @@ -30157,17 +30182,17 @@ <translation>Crea un &archivio per il plugin</translation> </message> <message> - <location filename="Project/Project.py" line="4058"/> + <location filename="Project/Project.py" line="4060"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation><p>Il file <b>PKGLIST</b> esiste già.</p><p>Sovrascriverlo?</p></translation> </message> <message> - <location filename="Project/Project.py" line="4102"/> + <location filename="Project/Project.py" line="4104"/> <source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source> <translation><p>Il file <b>PKGLIST </b> non esiste. Uscita...</p></translation> </message> <message> - <location filename="Project/Project.py" line="4110"/> + <location filename="Project/Project.py" line="4112"/> <source>The project does not have a main script defined. Aborting...</source> <translation>Non c'è uno script principale definito per il progetto. Esco...</translation> </message> @@ -30397,32 +30422,32 @@ <translation><p>VCS selezionato <b>{0}</b>non trovato.<br>Disabilito il controllo di versione.</p><p>{1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4085"/> + <location filename="Project/Project.py" line="4087"/> <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> <translation><p>Il file <b>PKGLIST</b> non può essere creato.<br />Motivo: {0}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4122"/> + <location filename="Project/Project.py" line="4124"/> <source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source> <translation><p>Il file <b>PKGLIST</b> non può essere letto.<br />Motivo: {0}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4133"/> + <location filename="Project/Project.py" line="4135"/> <source><p>The eric5 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation><p>Il file archivio del plugin di eric5<b>{0}</b> non può essere creato.<br />Motivo: {1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4153"/> + <location filename="Project/Project.py" line="4155"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation><p>Il file <b>{0}</b> non può essere aggiunto all'archivio.Lo ignoro.</p><p>Motivo: {1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4165"/> + <location filename="Project/Project.py" line="4167"/> <source><p>The eric5 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation><p>Il file archivio del plugin di eric5<b>{0} </b> è stato creato con successo.</p></translation> </message> <message> - <location filename="Project/Project.py" line="4245"/> + <location filename="Project/Project.py" line="4247"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation><p>Il file plugin <b>{0}</b> non può essere salvato.<br />Motivo: {1}</p></translation> </message> @@ -38933,182 +38958,182 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="314"/> <source>Importing project into Subversion repository</source> <translation>Importazione del progetto nel repository Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="363"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="364"/> <source>Subversion Checkout</source> <translation>Subversion Checkout</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>Il tag deve essere un tag normale (tags) o un tag branch (branch). Selezionarlo dalla lista.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="385"/> <source>Checking project out of Subversion repository</source> <translation>Checking del progetto dal repository subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> <source>Subversion Export</source> <translation>Subversion Export</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="445"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="446"/> <source>Exporting project from Subversion repository</source> <translation>Esportazione del progetto dal repository Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> <source>Subversion Error</source> <translation>Subversion Error</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="986"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="987"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>L'URL del repository del progetto non può essere recuperato dalla copia di lavoro. L'operazione di tag verrà interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1010"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1011"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>L'URL del repository del progetto a un formato non valido. L'operazione di tag verrà interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1101"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1102"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>L'URL del repository del progetto non può essere recuperato dalla copia di lavoro. L'operazione di switch verrà interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>L'URL del repository del progetto ha un formato non valido. L'operazione di switch verrà interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1548"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Subversion command</source> <translation>comando Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1776"/> <source>Subversion Set Property</source> <translation>Subversion Set Property</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1794"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1809"/> <source>You have to supply a property name. Aborting.</source> <translation>Devi fornire un nome per la proprietà. Interrompo.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1812"/> - <source>Subversion Delete Property</source> - <translation>Subversion Delete Property</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1632"/> - <source>Enter property name</source> - <translation>Inserisci nome proprietà</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="529"/> - <source>Commiting changes to Subversion repository</source> - <translation>Commit delle modifiche nel repository Subversion</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="585"/> - <source>Synchronizing with the Subversion repository</source> - <translation>Sincronizzazione con il repository Subversion</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="686"/> - <source>Adding files/directories to the Subversion repository</source> - <translation>Aggiunta di file/directory al repository subversion</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="785"/> - <source>Adding directory trees to the Subversion repository</source> - <translation>Aggiunta di alberi di directory al repository subversion</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="820"/> - <source>Removing files/directories from the Subversion repository</source> - <translation>Rimozione di file/directory al repository subversion</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1074"/> - <source>Reverting changes</source> - <translation>Annullamento modifiche</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1655"/> - <source>Resolving conficts</source> - <translation>Risoluzione conflitti</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="221"/> - <source>Create project in repository</source> - <translation>Crea progetto nel repository</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="221"/> - <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> - <translation>Il progetto non può essere creato nel repository. Probabilmente il repository non esiste o il server non è disponibile.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="243"/> - <source>New project</source> - <translation>Nuovo progetto</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="243"/> - <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> - <translation>Il progetto non può essere checked out dal repository.<br />Ripristisno dei contenuti originali.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="922"/> - <source>Subversion Log</source> - <translation>Log Subversion</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="922"/> - <source>Select number of entries to show.</source> - <translation>Mostra il numero di elementi da mostrare.</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1978"/> - <source>Locking in the Subversion repository</source> - <translation>Blocco nel repository Subversion</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2016"/> - <source>Unlocking in the Subversion repository</source> - <translation>Sblocco del repository Subversion</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1777"/> - <source>Property set.</source> - <translation>Proprietà impostata.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> + <source>Subversion Delete Property</source> + <translation>Subversion Delete Property</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1647"/> + <source>Enter property name</source> + <translation>Inserisci nome proprietà</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="530"/> + <source>Commiting changes to Subversion repository</source> + <translation>Commit delle modifiche nel repository Subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="586"/> + <source>Synchronizing with the Subversion repository</source> + <translation>Sincronizzazione con il repository Subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="687"/> + <source>Adding files/directories to the Subversion repository</source> + <translation>Aggiunta di file/directory al repository subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="786"/> + <source>Adding directory trees to the Subversion repository</source> + <translation>Aggiunta di alberi di directory al repository subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> + <source>Removing files/directories from the Subversion repository</source> + <translation>Rimozione di file/directory al repository subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1075"/> + <source>Reverting changes</source> + <translation>Annullamento modifiche</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1670"/> + <source>Resolving conficts</source> + <translation>Risoluzione conflitti</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <source>Create project in repository</source> + <translation>Crea progetto nel repository</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> + <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> + <translation>Il progetto non può essere creato nel repository. Probabilmente il repository non esiste o il server non è disponibile.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <source>New project</source> + <translation>Nuovo progetto</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> + <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> + <translation>Il progetto non può essere checked out dal repository.<br />Ripristisno dei contenuti originali.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <source>Subversion Log</source> + <translation>Log Subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> + <source>Select number of entries to show.</source> + <translation>Mostra il numero di elementi da mostrare.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1993"/> + <source>Locking in the Subversion repository</source> + <translation>Blocco nel repository Subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2031"/> + <source>Unlocking in the Subversion repository</source> + <translation>Sblocco del repository Subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1792"/> + <source>Property set.</source> + <translation>Proprietà impostata.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1842"/> <source>Property deleted.</source> <translation>Proprietà cancellata.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1958"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> <source>Subversion Lock</source> <translation>Lock Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1958"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> <source>Enter lock comment</source> <translation>Inserico commento del lock</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2076"/> <source>Relocating</source> <translation>Movimentazione</translation> </message> @@ -39263,37 +39288,37 @@ <translation>non versionato</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="195"/> <source>The svn process did not finish within 30s.</source> <translation>Il processo svn non è finito entro i 30s.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="196"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="197"/> <source>Could not start the svn executable.</source> <translation>Non posso avviare l'eseguibile svn.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> <source>Repository Browser</source> <translation>Browser Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> <source>Enter the repository URL.</source> <translation>Inserisci l'URL del repository.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2111"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2126"/> <source>Remove from changelist</source> <translation>Rimuovi dalla changelist</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2162"/> <source>Add to changelist</source> <translation>Aggiungi alla changelist</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2137"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2152"/> <source>Enter name of the changelist:</source> <translation>Inserisci il nome della changelist:</translation> </message> @@ -39313,53 +39338,53 @@ <translation>Changelist spostata</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> <source>The svn process finished with the exit code {0}</source> <translation>Il processo svn è terminato con codice di uscita {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="882"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="883"/> <source>Moving {0}</source> <translation>Spostamento di {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> <source>Tagging {0} in the Subversion repository</source> <translation>Tag di{0} nel repository subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1148"/> <source>Switching to {0}</source> <translation>Switch a {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1249"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1250"/> <source>Merging {0}</source> <translation>Merge di {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1512"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1527"/> <source>Cleaning up {0}</source> <translation>Pulizia di {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1694"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1709"/> <source>Copying {0}</source> <translation>copia di {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="329"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="330"/> <source>Imported revision {0}. </source> <translation>importata revisione {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="554"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="555"/> <source>Committed revision {0}.</source> <translation>Committata la revisione {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1154"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> <source>Revision {0}. </source> <translation>Revisione {0}. @@ -40901,7 +40926,7 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> <source>Resolve conflict</source> - <translation>Risolvi conflitti</translation> + <translation type="obsolete">Risolvi conflitti</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="636"/> @@ -41003,6 +41028,11 @@ <source>Remove from Changelist</source> <translation>Rimuovi dalla Changelist</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> + <source>Conflict resolved</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -41069,415 +41099,415 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>Add to repository</source> - <translation>Aggiungi al repository</translation> + <translation type="obsolete">Aggiungi al repository</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>&Add to repository...</source> - <translation>&Aggiungi al repository...</translation> + <translation type="obsolete">&Aggiungi al repository...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="92"/> <source>Add the local project to the VCS repository</source> - <translation>Aggiungi il progetto locale al repository VCS</translation> + <translation type="obsolete">Aggiungi il progetto locale al repository VCS</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="95"/> <source><b>Add to repository</b><p>This adds (imports) the local project to the VCS repository.</p></source> - <translation><b>Aggiungi al repository</b><p>Aggiunge (importa) il progetto locale al repository VCS.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="102"/> + <translation type="obsolete"><b>Aggiungi al repository</b><p>Aggiunge (importa) il progetto locale al repository VCS.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>Remove from repository (and disk)</source> <translation>Rimuovi dal repository (e dal disco)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>&Remove from repository (and disk)</source> <translation>&Rimuovi dal repository (e dal disco)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="93"/> <source>Remove the local project from the VCS repository (and disk)</source> <translation>Rimuovi il progetto locale dal repository VCS (e dal disco)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="109"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="96"/> <source><b>Remove from repository</b><p>This removes the local project from the VCS repository (and disk).</p></source> <translation><b>Rimuovi dal repository</b><p>Rimuove il progetto locale dal repository VCS (e dal disco).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> <source>Show log</source> <translation>Mostra log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> <source>Show &log</source> <translation>Mostra &log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="121"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="108"/> <source>Show the log of the local project</source> <translation>Mostra i log del progetto locale</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="124"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="111"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Mostra log</b><p>Mostra i log del progetto locale.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/> <source>Show difference</source> <translation>Mostra differenze</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/> <source>Show &difference</source> <translation>Mostra &differenza</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/> <source>Show the difference of the local project to the repository</source> <translation>Mostra le differenze tra il progetto locale e il repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="141"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation><b>Mostra differenze</b><p>Mostra le differenze tra il progetto locale e il repository.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="161"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="148"/> <source>Show difference (extended)</source> <translation>Mostra differenza (esteso)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Mostra le differenze tra la revisione del progetto e il repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="155"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation><b>Mostra differenze (esteso)</b><p>Mostra le differenze di una revisione selezionabile del progetto.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="177"/> <source>Show status</source> <translation>Mostra stato</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="177"/> <source>Show &status</source> <translation>Mostra &stato</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="181"/> <source>Show the status of the local project</source> <translation>Mostra lo stato del progetto locale</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Mostra stato</b><p>Mostra lo stato del progetto locale.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>Tag in repository</source> <translation>Tag nel repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>&Tag in repository...</source> <translation>&Tag nel repository...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> <source>Tag the local project in the repository</source> <translation>Tag del progetto locale nel repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Tag nel repository</b><p>Tag del progetto locale nel repository.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> <source>Export from repository</source> <translation>Esporta dal repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> <source>&Export from repository...</source> <translation>&Esporta dal repository...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="224"/> + <source>Export a project from the repository</source> + <translation>Esporta un progetto dal repositoty</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="227"/> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>Esporta dal repository</b><p>Esporta un progetto dal repository.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <source>Command options</source> + <translation>Opzione comando</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <source>Command &options...</source> + <translation>&Opzioni comando...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> - <source>Export a project from the repository</source> - <translation>Esporta un progetto dal repositoty</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="240"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation><b>Esporta dal repository</b><p>Esporta un progetto dal repository.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> - <source>Command options</source> - <translation>Opzione comando</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> - <source>Command &options...</source> - <translation>&Opzioni comando...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="250"/> <source>Show the VCS command options</source> <translation>Mostra le opzioni del comando VCS</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="251"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> <translation><b>Opzioni comando...</b><p>Mostra un dialogo per modificare le opzioni del comando VCS.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Revert changes</source> <translation>Inverti modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Re&vert changes</source> <translation>In&verti modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> <source>Revert all changes made to the local project</source> <translation>Inverti tutte le modifiche fatte al progetto locale</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="265"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Inverti modifiche</b><p>Inverte tutte le modifiche fatte al progetto locale.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> <source>Merge</source> <translation>Fondi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> <source>Mer&ge changes...</source> <translation>Fon&di modifiche...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="263"/> <source>Merge changes of a tag/revision into the local project</source> <translation>Fondi le modifiche del tag/revision nel progetto locale</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="279"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Fondi</b><p>Fonde le modifiche del tag/revisione nel progetto locale.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> <source>Switch</source> <translation>Scambia</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> <source>S&witch...</source> <translation>&Scambia...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> <source>Switch the local copy to another tag/branch</source> <translation>Cambia la copia locale ad un altro tag/branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>Cambia</b><p>Cambia la copia locale ad un altro tag/branch.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Resolve conflicts</source> - <translation>Risolvi conflitti</translation> + <translation type="obsolete">Risolvi conflitti</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Resolve con&flicts</source> - <translation>Risolvi con&flitti</translation> + <translation type="obsolete">Risolvi con&flitti</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> <source>Resolve all conflicts of the local project</source> - <translation>Risolvi tutti i conflitti del progetto locale</translation> + <translation type="obsolete">Risolvi tutti i conflitti del progetto locale</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> - <translation><b>Risolve conflitti</b><p>Risolve tutti i conflitti del progetto locale.</p></translation> + <translation type="obsolete"><b>Risolve conflitti</b><p>Risolve tutti i conflitti del progetto locale.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <source>Cleanup</source> + <translation>Pulisci</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <source>Cleanu&p</source> + <translation>&Pulisci</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> + <source>Cleanup the local project</source> + <translation>Pulisci il progetto locale</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Pulizia</b><p>Esegue la pulizia del progetto locale.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> - <source>Cleanup</source> - <translation>Pulisci</translation> + <source>Execute command</source> + <translation>Esegui comando</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> - <source>Cleanu&p</source> - <translation>&Pulisci</translation> + <source>E&xecute command...</source> + <translation>&Esegui comando...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> - <source>Cleanup the local project</source> - <translation>Pulisci il progetto locale</translation> + <source>Execute an arbitrary VCS command</source> + <translation>Esegui un comando VCS arbitrario</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Pulizia</b><p>Esegue la pulizia del progetto locale.</p></translation> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> + <translation><b>Esegui comando</b><p>Apre un dialogo per inserire un comando VCS arbitraio.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> - <source>Execute command</source> - <translation>Esegui comando</translation> + <source>List tags</source> + <translation>Elenca tag</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> - <source>E&xecute command...</source> - <translation>&Esegui comando...</translation> + <source>List tags...</source> + <translation>Elenca tag...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> - <source>Execute an arbitrary VCS command</source> - <translation>Esegui un comando VCS arbitrario</translation> + <source>List tags of the project</source> + <translation>Elenca i tag del progetto</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> - <translation><b>Esegui comando</b><p>Apre un dialogo per inserire un comando VCS arbitraio.</p></translation> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Elenca tag</b><p>Elenca i tag del progetto.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> - <source>List tags</source> - <translation>Elenca tag</translation> + <source>List branches</source> + <translation>Elenca branches</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> - <source>List tags...</source> - <translation>Elenca tag...</translation> + <source>List branches...</source> + <translation>Elenca branches...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> - <source>List tags of the project</source> - <translation>Elenca i tag del progetto</translation> + <source>List branches of the project</source> + <translation>Elenca i branches del progetto</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>Elenca tag</b><p>Elenca i tag del progetto.</p></translation> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Elenca branches</b><p>Elenca i branch del progetto.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> - <source>List branches</source> - <translation>Elenca branches</translation> + <source>List repository contents</source> + <translation>Elenca contenuti repository</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> - <source>List branches...</source> - <translation>Elenca branches...</translation> + <source>List repository contents...</source> + <translation>Elenca contenuti repository...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> - <source>List branches of the project</source> - <translation>Elenca i branches del progetto</translation> + <source>Lists the contents of the repository</source> + <translation>Elenca i contenuti del repository</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Elenca branches</b><p>Elenca i branch del progetto.</p></translation> + <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> + <translation><b>Elanca contenuti del repository</b><p>Elenca i contenuti del repository.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> - <source>List repository contents</source> - <translation>Elenca contenuti repository</translation> + <source>Set Property</source> + <translation>Imposta proprietà</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> - <source>List repository contents...</source> - <translation>Elenca contenuti repository...</translation> + <source>Set Property...</source> + <translation>Imposta proprietà...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> - <source>Lists the contents of the repository</source> - <translation>Elenca i contenuti del repository</translation> + <source>Set a property for the project files</source> + <translation>Imposta una proprietà per i file del progetto</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> - <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> - <translation><b>Elanca contenuti del repository</b><p>Elenca i contenuti del repository.</p></translation> + <source><b>Set Property</b><p>This sets a property for the project files.</p></source> + <translation><b>Imposta proprietà</b><p>Imposta una proprietà per i file del progetto.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> - <source>Set Property</source> - <translation>Imposta proprietà</translation> + <source>List Properties</source> + <translation>Elenca proprietà</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> - <source>Set Property...</source> - <translation>Imposta proprietà...</translation> + <source>List Properties...</source> + <translation>Elenca proprietà...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> - <source>Set a property for the project files</source> - <translation>Imposta una proprietà per i file del progetto</translation> + <source>List properties of the project files</source> + <translation>Elenca le proprietà dei file del progetto</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> - <source><b>Set Property</b><p>This sets a property for the project files.</p></source> - <translation><b>Imposta proprietà</b><p>Imposta una proprietà per i file del progetto.</p></translation> + <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> + <translation><b>Elenca proprietà</b><p>Elenca le proprietàd ei file del progetto.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> - <source>List Properties</source> - <translation>Elenca proprietà</translation> + <source>Delete Property</source> + <translation>Cancella proprietà</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> - <source>List Properties...</source> - <translation>Elenca proprietà...</translation> + <source>Delete Property...</source> + <translation>Cancella proprietà...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> - <source>List properties of the project files</source> - <translation>Elenca le proprietà dei file del progetto</translation> + <source>Delete a property for the project files</source> + <translation>Cancella una proprietà per i file del progetto</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> - <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> - <translation><b>Elenca proprietà</b><p>Elenca le proprietàd ei file del progetto.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> - <source>Delete Property</source> - <translation>Cancella proprietà</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> - <source>Delete Property...</source> - <translation>Cancella proprietà...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> - <source>Delete a property for the project files</source> - <translation>Cancella una proprietà per i file del progetto</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="410"/> <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> <translation><b>Cancella proprietà</b><p>Cancella una proprietà per i file del progetto.</p></translation> </message> @@ -41497,110 +41527,130 @@ <translation type="obsolete"><b>Mostra log ridotto</b><p>Mostra il log del progetto locale limitato ad un numero selezionabile di elementi.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="204"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> <source>Show repository info</source> <translation>Mostra informazioni del repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="208"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> <source>Show some repository related information for the local project</source> <translation>Mostra alcune informazioni relative al repository del progetto locale</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> <source>Relocate</source> <translation>Rialloca</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> <source>Relocate...</source> <translation>Rialloca...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="408"/> <source>Relocate the working copy to a new repository URL</source> <translation>Rialloca la copia di lavoro ad una nuovo URL del repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="424"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="411"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>Rialloca</b><p>Rialloca la copia di lavoro ad una nuovo URL del repository.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation><b>Mostra informazioni Repository</b><p>Mostra alcune informazioni relative al repository del progetto locale.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="175"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="162"/> <source>Show difference (URLs)</source> <translation>Mostra differenze (URLs)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="166"/> <source>Show the difference of the project between two repository URLs</source> <translation>Mostra le differenze del progetto tra due URL del repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> <source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source> <translation><b>Mostra le differenze (URLs)</b><p>Mostra le differenze del progetto tra due URLs di repostitory.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="118"/> <source>Show log browser</source> <translation>Mostra browser log</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/> <source>Show a dialog to browse the log of the local project</source> <translation>Mostra un dialogo per navigare i log del progetto locale</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="125"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Mostra borwser log</b><p>Mostra un dialogo per navigare i log del progetto locale. Inizialmente viene mostrato un numero limitato di elementi. Altri possono essere scaricati in seguito.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> <source>Repository Browser</source> <translation>Browser Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> <source>Repository Browser...</source> <translation>Browser Repository...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <source>Show the Repository Browser dialog</source> + <translation>Mostra il dialogo del Browser di repository</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation><b>Browser Repository</b><p>Mostra il dialogo del Browser del repository.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <source>Configure</source> + <translation>Configura</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <source>Configure...</source> + <translation>Configura...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> - <source>Show the Repository Browser dialog</source> - <translation>Mostra il dialogo del Browser di repository</translation> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation>Mostra il dialogo di configurazione con la pagina di Subversion selezionata</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation><b>Browser Repository</b><p>Mostra il dialogo del Browser del repository.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> - <source>Configure</source> - <translation>Configura</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> - <source>Configure...</source> - <translation>Configura...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> - <source>Show the configuration dialog with the Subversion page selected</source> - <translation>Mostra il dialogo di configurazione con la pagina di Subversion selezionata</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation><b>Configura</b><p>Mostra il dialogo di configurazione con la pagina di Subversion selezionata.</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnPropDelDialog</name> @@ -50526,17 +50576,17 @@ <context> <name>VersionControl</name> <message> - <location filename="VCS/VersionControl.py" line="536"/> + <location filename="VCS/VersionControl.py" line="547"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="662"/> + <location filename="VCS/VersionControl.py" line="673"/> <source>Repository status checking is switched off</source> <translation>Il controllo dello stato del repository è spento</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="536"/> + <location filename="VCS/VersionControl.py" line="547"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> @@ -54214,24 +54264,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1236"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Origine #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1733"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Tags</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1741"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branches</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1252"/> <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> @@ -54240,7 +54290,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -54257,24 +54307,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Changeset</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1745"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Origini</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1734"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/> <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> @@ -54284,7 +54334,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -54528,17 +54578,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1589"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1604"/> <source>unknown</source> <translation>sconosciuto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1458"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1473"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Informazioni Repository</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Revisione corrente </b></td><td>{2}</td></tr><tr><td><b>Revisione committata</b></td><td>{3}</td></tr><tr><td><b>Data della commit</b></td><td>{4}</td></tr><tr><td><b>Ora della commit</b></td><td>{5}</td></tr><tr><td><b>Ultimo autore</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1590"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Informazioni Repository</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Revisione corrente</b></td><td>{4}</td></tr><tr><td><b>Revisione Committata</b></td><td>{5}</td></tr><tr><td><b>Data della commit</b></td><td>{6}</td></tr><tr><td><b>Ora della commit</b></td><td>{7}</td></tr><tr><td><b>Ultimo autore</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_ru.ts Mon May 28 15:59:36 2012 +0200 +++ b/i18n/eric5_ru.ts Tue May 29 20:59:40 2012 +0200 @@ -16835,42 +16835,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/> <source>The hg process finished with the exit code {0}</source> <translation>Процесс hg завершился с кодом возврата {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="252"/> - <source>The hg process did not finish within 30s.</source> - <translation>Процесс hg не завершился в течение 30 секунд.</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="254"/> + <source>The hg process did not finish within 30s.</source> + <translation>Процесс hg не завершился в течение 30 секунд.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="256"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> <source>Create project repository</source> <translation>Создать репозиторий проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> <source>The project repository could not be created.</source> <translation>Не могу создать репозиторий проекта.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="310"/> <source>Creating Mercurial repository</source> <translation>Создание репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="325"/> <source>Initial commit to Mercurial repository</source> <translation>Первичная подача в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="369"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="371"/> <source>Cloning project from a Mercurial repository</source> <translation>Создание копии репозитория</translation> </message> @@ -16880,32 +16880,32 @@ <translation type="obsolete">Подача изменений в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="533"/> <source>Synchronizing with the Mercurial repository</source> <translation>Синхронизация с репозиторием</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="585"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Добавление файлов/каталогов в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="647"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="649"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Удаление файлов/каталогов из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/> <source>Renaming {0}</source> <translation>Переименование {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="925"/> <source>Merging</source> <translation>Слияние</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1352"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> @@ -16920,207 +16920,207 @@ <translation type="obsolete">Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1597"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1611"/> <source>Pulling from a remote Mercurial repository</source> <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1650"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> <source>Pushing to a remote Mercurial repository</source> <translation>Загрузка изменений в удалённый репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Resolving files/directories</source> <translation>Разрешение конфликтов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="840"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="842"/> <source>Taging in the Mercurial repository</source> <translation>Создание меток в репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="873"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="875"/> <source>Reverting changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1176"/> <source>Mercurial command</source> <translation>Mercurial команда</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> <source>Create Branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> <source>Enter branch name</source> <translation>Введите имя ветви</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1882"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Showing aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочий каталог?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1839"/> <source>Showing current branch</source> <translation>Текущая ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная подкоманда ({0}) для Bisect.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1976"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> <source>Identifying project directory</source> <translation>Каталог проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже существует. Перезаписать?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2305"/> <source>Removing files from the Mercurial repository only</source> <translation>Удаление файлов только из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial файлы изменений (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2185"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <source>Identifying changegroup file</source> <translation>Файлы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл группы изменений<b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2367"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2381"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="479"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="481"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -19697,7 +19697,7 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> <source>Resolve conflict</source> - <translation>Разрешить конфликт</translation> + <translation type="obsolete">Разрешить конфликт</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> @@ -19749,6 +19749,11 @@ <source>Do you really want to remove these files from the repository?</source> <translation>Вы правда хотите удалить эти файлы переводов и из репозитория?</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> + <source>Conflict resolved</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -19895,60 +19900,60 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Add to repository</source> - <translation>Добавить в репозиторий</translation> + <translation type="obsolete">Добавить в репозиторий</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>&Add to repository...</source> - <translation>&Добавить в репозиторий...</translation> + <translation type="obsolete">&Добавить в репозиторий...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="225"/> <source>Add the local project to the repository</source> - <translation>Добавить локальный проект в репозиторий</translation> + <translation type="obsolete">Добавить локальный проект в репозиторий</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228"/> <source><b>Add to repository</b><p>This adds (imports) the local project to the repository.</p></source> - <translation><b>Добавить в репозиторий</b><p>Добавляет (импортирует) локальный проект в репозиторий.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <translation type="obsolete"><b>Добавить в репозиторий</b><p>Добавляет (импортирует) локальный проект в репозиторий.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Remove from repository (and disk)</source> <translation>Удаление из репозитория (и с диска)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>&Remove from repository (and disk)</source> <translation>&Удалить из репозитория (и с диска)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="239"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> <source>Remove the local project from the repository (and disk)</source> <translation>Удалить локальный проект из репозитория (и диска)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> <source><b>Remove from repository</b><p>This removes the local project from the repository (and disk).</p></source> <translation><b>Удалить из репозитория</b><p>Удалить локальный проект из репозитория. Локальная копия (на диске) также будет удалена.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Show log</source> <translation>Показать журнал</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Show &log</source> <translation>Показать &журнал</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241"/> <source>Show the log of the local project</source> <translation>Показать журнал изменений локального проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="257"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="244"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Показать журнал</b><p>Показать журнал изменений локального проекта.</p></translation> </message> @@ -19968,372 +19973,372 @@ <translation type="obsolete"><b>Показать ограниченный журнал</b><p>Отображает журнал с заданным количеством элементов.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>Show log browser</source> <translation>Показать проводник журналов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="255"/> <source>Show a dialog to browse the log of the local project</source> <translation>Показать диалог для навигации по файлу журнала для локального проекта</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation><b>Показать проводник журнала</b><p>Показывает диалог для навигации по файлу журнала локального проекта. Изначально показывается ограниченное количество записей. Дальнейшие записи могут быть получены позже.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> + <source>Show difference</source> + <translation>Показать различие</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> + <source>Show &difference</source> + <translation>Показать &различие</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> - <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> - <translation><b>Показать проводник журнала</b><p>Показывает диалог для навигации по файлу журнала локального проекта. Изначально показывается ограниченное количество записей. Дальнейшие записи могут быть получены позже.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> - <source>Show difference</source> - <translation>Показать различие</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> - <source>Show &difference</source> - <translation>Показать &различие</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> <source>Show the difference of the local project to the repository</source> <translation>Показать изменения между репозиторием и локальной копией</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation><b>Показать различие</b><p>Показать различие между локальным проектом и репозиторием.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> <source>Show difference (extended)</source> <translation>Показать различие (расширенно)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Показать разницу версий между репозиторием и локальной копией</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation><b>Показать разницу (насширенно)</b><p>Отображает различие выбираемых ревизий проекта.</p></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <source>Show heads</source> + <translation>Показать текущие версии</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> + <source>Show the heads of the repository</source> + <translation>Показать текущие версии в репозитории</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> + <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> + <translation><b>Показать текущие версии</b><p>Показать текущие версии в репозитории.</p></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> - <source>Show heads</source> - <translation>Показать текущие версии</translation> + <source>Show parents</source> + <translation>Показать предков</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> - <source>Show the heads of the repository</source> - <translation>Показать текущие версии в репозитории</translation> + <source>Show the parents of the repository</source> + <translation>Показать предков репозитория</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="328"/> - <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> - <translation><b>Показать текущие версии</b><p>Показать текущие версии в репозитории.</p></translation> + <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> + <translation><b>Показать предков</b><p>Показать предков репозитория.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> - <source>Show parents</source> - <translation>Показать предков</translation> + <source>Show tip</source> + <translation>Показать tip</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> - <source>Show the parents of the repository</source> - <translation>Показать предков репозитория</translation> + <source>Show the tip of the repository</source> + <translation>Показать tip репозитория</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="341"/> - <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> - <translation><b>Показать предков</b><p>Показать предков репозитория.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> - <source>Show tip</source> - <translation>Показать tip</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="351"/> - <source>Show the tip of the repository</source> - <translation>Показать tip репозитория</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Показать tip</b><p>Показать tip репозитория.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Merge</source> <translation>Слить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Mer&ge changes...</source> <translation>С&лить изменения...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> <source>Merge changes of a revision into the local project</source> <translation>Слить изменения из ревизии с локальным проектом</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Слить</b><p>Слить изменения из ревизии с локальным проектом.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve conflicts</source> - <translation>Разрешить конфликты</translation> + <translation type="obsolete">Разрешить конфликты</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve con&flicts</source> - <translation>Разрешить кон&фликты</translation> + <translation type="obsolete">Разрешить кон&фликты</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="392"/> <source>Resolve all conflicts of the local project</source> - <translation>Разрешить все конфликты, возникшие в локальном проекте</translation> + <translation type="obsolete">Разрешить все конфликты, возникшие в локальном проекте</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> - <translation><b>Разрешить конфликты</b><p>Разрешить все конфликты в локальном проекте.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> + <translation type="obsolete"><b>Разрешить конфликты</b><p>Разрешить все конфликты в локальном проекте.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show status</source> <translation>Показать статус</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show &status</source> <translation>Показать &статус</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> <source>Show the status of the local project</source> <translation>Показать статус локального проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Показать статус</b><p>Показать статус локального проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> <source>Re&vert changes</source> <translation>От&мена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/> <source>Revert all changes made to the local project</source> <translation>Отменить все изменения в локальном проекте</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Отмена изменений</b><p>Все изменения в локальном проекте будут отменены.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Tag in repository</source> <translation>Создать метку в репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>&Tag in repository...</source> <translation>Создать &метку в репозитории...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> + <source>Tag the local project in the repository</source> + <translation>Создать в репозитории метку для проекта</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation><b>Создать метку</b><p>Создаёт метку для локального проекта в репозитории.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <source>List tags</source> + <translation>Список меток</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <source>List tags...</source> + <translation>Список меток...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> - <source>Tag the local project in the repository</source> - <translation>Создать в репозитории метку для проекта</translation> + <source>List tags of the project</source> + <translation>Список меток текущего проекта</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="409"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation><b>Создать метку</b><p>Создаёт метку для локального проекта в репозитории.</p></translation> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Список меток</b><p>Отображает список меток текущего проекта.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>List tags</source> - <translation>Список меток</translation> + <source>List branches</source> + <translation>Список ветвей</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>List tags...</source> - <translation>Список меток...</translation> + <source>List branches...</source> + <translation>Список ветвей...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> - <source>List tags of the project</source> - <translation>Список меток текущего проекта</translation> + <source>List branches of the project</source> + <translation>Список ветвей текущего проекта</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>Список меток</b><p>Отображает список меток текущего проекта.</p></translation> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Список ветвей</b><p>Отображает список ветвей текущего проекта.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source>List branches</source> - <translation>Список ветвей</translation> + <source>Create branch</source> + <translation>Создать ветвь</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source>List branches...</source> - <translation>Список ветвей...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/> - <source>List branches of the project</source> - <translation>Список ветвей текущего проекта</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Список ветвей</b><p>Отображает список ветвей текущего проекта.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> - <source>Create branch</source> - <translation>Создать ветвь</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> <source>Create &branch...</source> <translation>Создать &ветвь...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> <source>Create a new branch for the local project in the repository</source> <translation>Создать новую ветвь в репозитории для локального проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Создать ветвь</b><p>Создать новую ветвь в репозитории для локального проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> <source>Close branch</source> <translation>Закрыть ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> <source>Close the current branch of the local project</source> <translation>Закрыть ветвь локального проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Закрыть ветвь</b><p>Закрыть ветвь в репозитории для локального проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source>Switch</source> <translation>Переключиться</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source>S&witch...</source> <translation>Пе&реключиться...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> + <source>Switch the working directory to another revision</source> + <translation>Переключить рабочий каталог на другую ревизию</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="491"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation><b>Переключить</b><p>Переключить рабочий каталог на другую ревизию.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <source>Cleanup</source> + <translation>Очистка</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <source>Cleanu&p</source> + <translation>О&чистка</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> - <source>Switch the working directory to another revision</source> - <translation>Переключить рабочий каталог на другую ревизию</translation> + <source>Cleanup the local project</source> + <translation>Очистить локальный проект</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> - <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> - <translation><b>Переключить</b><p>Переключить рабочий каталог на другую ревизию.</p></translation> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Очистка</b><p>Очистить локальный проект.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> - <source>Cleanup</source> - <translation>Очистка</translation> + <source>Execute command</source> + <translation>Выполнить команду</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> - <source>Cleanu&p</source> - <translation>О&чистка</translation> + <source>E&xecute command...</source> + <translation>В&ыполнить команду...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> - <source>Cleanup the local project</source> - <translation>Очистить локальный проект</translation> + <source>Execute an arbitrary Mercurial command</source> + <translation>Выполнить произвольную команду Mercurial</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Очистка</b><p>Очистить локальный проект.</p></translation> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> + <translation><b>Выполнить команду</b><p>Открыть диалог для ввода произвольной команды Mercurial.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> - <source>Execute command</source> - <translation>Выполнить команду</translation> + <source>Command options</source> + <translation>Опции командной строки</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> - <source>E&xecute command...</source> - <translation>В&ыполнить команду...</translation> + <source>Command &options...</source> + <translation>&Опции командной строки...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>Execute an arbitrary Mercurial command</source> - <translation>Выполнить произвольную команду Mercurial</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> - <translation><b>Выполнить команду</b><p>Открыть диалог для ввода произвольной команды Mercurial.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> - <source>Command options</source> - <translation>Опции командной строки</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> - <source>Command &options...</source> - <translation>&Опции командной строки...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>Show the Mercurial command options</source> <translation>Показать опции командной строки Mercurial</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> + <translation><b>Опции командной строки...</b><p>Показать диалог для редактирования опций командной строки Mercurial.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Configure</source> + <translation>Настроить</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Configure...</source> + <translation>Настроить...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <source>Show the configuration dialog with the Mercurial page selected</source> + <translation>Показать диалог настроек с выбранной страницей настроек Mercurial</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> - <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> - <translation><b>Опции командной строки...</b><p>Показать диалог для редактирования опций командной строки Mercurial.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> - <source>Configure</source> - <translation>Настроить</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> - <source>Configure...</source> - <translation>Настроить...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> - <source>Show the configuration dialog with the Mercurial page selected</source> - <translation>Показать диалог настроек с выбранной страницей настроек Mercurial</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Настроить</b><p>Показать диалог настроек с выбранной страницей настроек Mercurial.</p></translation> </message> @@ -20378,177 +20383,177 @@ <translation type="obsolete"><b>Показ комбинированных настроек</b><p>Показ комбинированных настроек из всех конфигурационных файлов.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> <source>Show paths</source> <translation>Показать пути</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <source>Show paths...</source> + <translation>Показать пути...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <source>Show the aliases for remote repositories</source> + <translation>Алиасы для удалённых репозиториев</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation><b>Показать пути</b><p>Показать алиасы для удалённых репозиториев.</p></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> - <source>Show paths...</source> - <translation>Показать пути...</translation> + <source>Verify repository</source> + <translation>Проверить репозиторий</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <source>Verify repository...</source> + <translation>Проверить репозиторий...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> - <source>Show the aliases for remote repositories</source> - <translation>Алиасы для удалённых репозиториев</translation> + <source>Verify the integrity of the repository</source> + <translation>Проверить целостность репозитория</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> - <translation><b>Показать пути</b><p>Показать алиасы для удалённых репозиториев.</p></translation> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <translation><b>Проверить целостность репозитория</b><p>Проверить целостность репозитория.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Verify repository</source> - <translation>Проверить репозиторий</translation> + <source>Recover</source> + <translation>Восстановить</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Verify repository...</source> - <translation>Проверить репозиторий...</translation> + <source>Recover...</source> + <translation>Восстановить...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> - <source>Verify the integrity of the repository</source> - <translation>Проверить целостность репозитория</translation> + <source>Recover from an interrupted transaction</source> + <translation>Восстановить после прерванной транзакции</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> - <translation><b>Проверить целостность репозитория</b><p>Проверить целостность репозитория.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> - <source>Recover</source> - <translation>Восстановить</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> - <source>Recover...</source> - <translation>Восстановить...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> - <source>Recover from an interrupted transaction</source> - <translation>Восстановить после прерванной транзакции</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Восстановить</b><p>Восстановить после прерванной транзакции.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Repository Administration</source> <translation>Администрирование репозитория</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <source>Create .hgignore</source> + <translation>Создать файл .hgignore</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <source>Create a .hgignore file with default values</source> + <translation>Создать файл .hgignore со значениями по умолчанию</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation><b>Создать файл .hgignore</b><p>Создать файл .hgignore со значениями по умолчанию.</p></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> - <source>Create .hgignore</source> - <translation>Создать файл .hgignore</translation> + <source>Create changegroup</source> + <translation>Создать группу изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <source>Create changegroup...</source> + <translation>Создать группу изменений...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> - <source>Create a .hgignore file with default values</source> - <translation>Создать файл .hgignore со значениями по умолчанию</translation> + <source>Create changegroup file collecting changesets</source> + <translation>Создать файл коллекции изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> + <source>Apply changegroups</source> + <translation>Применить группу изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <source>Apply changegroups...</source> + <translation>Применить группу изменений...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> + <source>Apply one or several changegroup files</source> + <translation>Применить файл(ы) группы изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> + <source>Changegroup Management</source> + <translation>Менеджмент группы изменений</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation><b>Создать файл .hgignore</b><p>Создать файл .hgignore со значениями по умолчанию.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Create changegroup</source> - <translation>Создать группу изменений</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Create changegroup...</source> - <translation>Создать группу изменений...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> - <source>Create changegroup file collecting changesets</source> - <translation>Создать файл коллекции изменений</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> - <source>Apply changegroups</source> - <translation>Применить группу изменений</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> - <source>Apply changegroups...</source> - <translation>Применить группу изменений...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> - <source>Apply one or several changegroup files</source> - <translation>Применить файл(ы) группы изменений</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> - <source>Changegroup Management</source> - <translation>Менеджмент группы изменений</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Создать группу изменений</b><p>Создать группу изменений собрав выбранные изменения (hg bundle).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Применить группы изменений</b><p>Применить одну или несколько групп изменений созданную командой 'Создать группу изменений' (hg unbundle).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source>Show current branch</source> <translation>Показать текущую ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> <source>Show the current branch of the project</source> <translation>Показать текущую ветвь проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Показать текущую ветвь</b><p>Показать текущую ветвь проекта.</p></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Mark as "good"</source> + <translation>Пометить как "хороший"</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <source>Mark a selectable changeset as good</source> + <translation>Пометить выбранные изменения как "хорошие"</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation><b>Пометить как "хорошие"</b><p>Пометить выбранные изменения как "хорошие".</p></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> - <source>Mark as "good"</source> - <translation>Пометить как "хороший"</translation> + <source>Mark as "bad"</source> + <translation>Пометить как "плохой"</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> - <source>Mark a selectable changeset as good</source> - <translation>Пометить выбранные изменения как "хорошие"</translation> + <source>Mark a selectable changeset as bad</source> + <translation>Пометить выбранные изменения как "плохие"</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation><b>Пометить как "хорошие"</b><p>Пометить выбранные изменения как "хорошие".</p></translation> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> + <translation><b>Пометить как "плохие"</b><p>Пометить выбранные изменения как "плохие".</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Mark as "bad"</source> - <translation>Пометить как "плохой"</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> - <source>Mark a selectable changeset as bad</source> - <translation>Пометить выбранные изменения как "плохие"</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> - <translation><b>Пометить как "плохие"</b><p>Пометить выбранные изменения как "плохие".</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source>Skip</source> <translation>Пропустить</translation> </message> @@ -20563,107 +20568,107 @@ <translation type="obsolete"><b>Пропустить</b><p>Пропустить текущие изменения.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> <source>Reset</source> <translation>Сбросить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> <source>Reset the bisect search data</source> <translation>Сбросить данные двоичного поиска</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Сбросить</b><p>Сбросить данные двоичного поиска.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source>Bisect</source> <translation>Двоичный поиск</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Mark as "good"...</source> + <translation>Пометить как "хороший"...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> - <source>Mark as "good"...</source> - <translation>Пометить как "хороший"...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Mark as "bad"...</source> <translation>Пометить как "плохой"...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Preview changegroup</source> <translation>Предпросмотр группы изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Preview changegroup...</source> <translation>Предпросмотр группы изменений...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Identify</source> <translation>Идентифицировать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Identify...</source> <translation>Идентифицировать...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> <source>Identify the project directory</source> <translation>Задайте каталог проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation><b>Каталог проекта</b><p>Задайте каталог проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="671"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation>Предпросмотр файла содержащего коллекцию групп изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation><b>Предпросмотр групп изменений</b><p>Предпросмотр файла содержащего коллекцию групп изменений.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Identify changegroup</source> <translation>Выбрать группу изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Identify changegroup...</source> <translation>Выбрать группу изменений...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation>Выбрать файл содержащий коллекцию групп изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation><b>Выбрать изменения</b><p>Выбрать файл содержащий коллекцию групп изменений.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Back out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Back out changes of an earlier changeset</source> <translation>Отмена предыдущих изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Отмена изменений</b><p>Отмена предыдущих изменений.</p></translation> </message> @@ -20683,260 +20688,280 @@ <translation><b>Послать изменения (принудительно)</b><p>Послать изменения в удалённый репозиторий (принудительно).</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> <source>Specials</source> <translation>Специфический</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Serve project repository</source> <translation>Запустить сервер для репозитория проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Serve project repository...</source> <translation>Запустить сервер для репозитория проекта...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/> <source>Serve the project repository</source> <translation>Запустить сервер для репозитория проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation><b>Запустить сервер для репозитория проекта</b><p>Запустить сервер для репозитория проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094"/> <source>Pull</source> <translation>Загрузить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> <source>The project should be reread. Do this now?</source> <translation>Необходимо перезагрузить проект. Сделать это?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care.</strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> + <source>Show an editor to edit the user configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit user configuration</source> + <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit user configuration...</source> + <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> - <source>Show an editor to edit the user configuration file</source> + <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Edit repository configuration</source> + <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> - <source>Show an editor to edit the repository configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="578"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1311"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Import Patch...</source> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> - <source>Import a patch from a patch file</source> + <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> - <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> - <source>Patch Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344"/> - <source>Revert Changes</source> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> - <source>Export Patches</source> + <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> - <source>Export Patches...</source> + <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/> - <source>Export revisions to patch files</source> + <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> - <source>Change Phase...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> - <source>Change the phase of revisions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1349"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856"/> + <source>Copies changesets from another branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> - <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -29828,7 +29853,7 @@ <translation><b>Заключение охвата по коду...</b><p>Показать заключение охвата по коду всех файлов проекта.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3901"/> + <location filename="Project/Project.py" line="3903"/> <source>Profile Data</source> <translation>Данные профайлера</translation> </message> @@ -29883,7 +29908,7 @@ <translation>Система контроля версий</translation> </message> <message> - <location filename="Project/Project.py" line="3880"/> + <location filename="Project/Project.py" line="3882"/> <source>There is no main script defined for the current project. Aborting</source> <translation>Для текущего проекта не определён главный сценарий. Отмена</translation> </message> @@ -29893,12 +29918,12 @@ <translation>Контроль &версий</translation> </message> <message> - <location filename="Project/Project.py" line="3834"/> + <location filename="Project/Project.py" line="3836"/> <source>Coverage Data</source> <translation>Данные охвата</translation> </message> <message> - <location filename="Project/Project.py" line="3954"/> + <location filename="Project/Project.py" line="3956"/> <source>Application Diagram</source> <translation>Диаграмма приложения</translation> </message> @@ -29928,17 +29953,17 @@ <translation>Сохранить файл проекта</translation> </message> <message> - <location filename="Project/Project.py" line="3855"/> + <location filename="Project/Project.py" line="3857"/> <source>Code Coverage</source> <translation>Заключения охвата по коду</translation> </message> <message> - <location filename="Project/Project.py" line="3855"/> + <location filename="Project/Project.py" line="3857"/> <source>Please select a coverage file</source> <translation>Пожалуйста, выберите файл для информации охвата</translation> </message> <message> - <location filename="Project/Project.py" line="3901"/> + <location filename="Project/Project.py" line="3903"/> <source>Please select a profile file</source> <translation>Пожалуйста, выберите файл профиля</translation> </message> @@ -30084,7 +30109,7 @@ <translation>Другое</translation> </message> <message> - <location filename="Project/Project.py" line="3954"/> + <location filename="Project/Project.py" line="3956"/> <source>Include module names?</source> <translation>Включать имена модулей?</translation> </message> @@ -30398,7 +30423,7 @@ </translation> </message> <message> - <location filename="Project/Project.py" line="4085"/> + <location filename="Project/Project.py" line="4087"/> <source>Create Package List</source> <translation>Создать список пакетов</translation> </message> @@ -30408,7 +30433,7 @@ <translation>&Создать список пакетов</translation> </message> <message> - <location filename="Project/Project.py" line="4245"/> + <location filename="Project/Project.py" line="4247"/> <source>Create Plugin Archive</source> <translation>Создать архив подключаемого модуля</translation> </message> @@ -30418,27 +30443,27 @@ <translation>Создать &архив плагина</translation> </message> <message> - <location filename="Project/Project.py" line="4058"/> + <location filename="Project/Project.py" line="4060"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation><p>Файл <b>PKGLIST</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="Project/Project.py" line="4085"/> + <location filename="Project/Project.py" line="4087"/> <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> <translation><p>Невозможно создать файл <b>PKGLIST</b>.</p><p>Причина: {0}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4102"/> + <location filename="Project/Project.py" line="4104"/> <source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source> <translation><p>Файл <b>PKGLIST</b> не существует. Отмена...</p></translation> </message> <message> - <location filename="Project/Project.py" line="4110"/> + <location filename="Project/Project.py" line="4112"/> <source>The project does not have a main script defined. Aborting...</source> <translation>Для текущего проекта не определён главный сценарий. Отмена...</translation> </message> <message> - <location filename="Project/Project.py" line="4122"/> + <location filename="Project/Project.py" line="4124"/> <source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source> <translation><p>Невозможно прочитать файл <b>PKGLIST</b>.</p><p>Причина: {0}</p></translation> </message> @@ -30468,7 +30493,7 @@ <translation><p>Тип проекта <b>{0}</b> уже существует.</p></translation> </message> <message> - <location filename="Project/Project.py" line="4153"/> + <location filename="Project/Project.py" line="4155"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation><p>Невозможно сохранить в архив файл <b>{0}</b>. Игнорируем его.</p><p>Причина: {1}</p></translation> </message> @@ -30483,7 +30508,7 @@ <translation>Создать архив плагинов (&снимок)</translation> </message> <message> - <location filename="Project/Project.py" line="4245"/> + <location filename="Project/Project.py" line="4247"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation><p>Невозможно прочитать файл плагина <b>{0}</b>.</p><p>Причина: {1}</p></translation> </message> @@ -30583,12 +30608,12 @@ <translation><b>Создать файл архива плагинов (снимок выпуска)</b><p>Создаёт файл архива плагинов eric5, используя список файлов, указанный в файле PKGLIST. Имя архива строится из имени главного сценария. Версия главного сценария меняется, чтобы соответствовать версии выпуска снимка.</p></translation> </message> <message> - <location filename="Project/Project.py" line="4133"/> + <location filename="Project/Project.py" line="4135"/> <source><p>The eric5 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation><p>Невозможно создать подключаемый модуль eric5 <b>{0}</b>.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4165"/> + <location filename="Project/Project.py" line="4167"/> <source><p>The eric5 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation><p>Подключаемый модуль <b>{0}</b> был успешно создан.</p></translation> </message> @@ -39052,223 +39077,223 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="314"/> <source>Importing project into Subversion repository</source> <translation>Импорт проекта в репозиторий Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="363"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="364"/> <source>Subversion Checkout</source> <translation>Закрузка из Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>Тег должен быть обычным тегом (tag) или ветвью (branch). Пожалуйста, выберите из списка.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="385"/> <source>Checking project out of Subversion repository</source> <translation>Загрузка проекта из репозитория Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> <source>Subversion Export</source> <translation>Экспорт из Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="445"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="446"/> <source>Exporting project from Subversion repository</source> <translation>Экспорт файлов из репозитория Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> <source>Subversion Error</source> <translation>Ошибка Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="986"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="987"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>URL репозитория проекта недоступен из рабочей копии. Операция кстановки тега будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1010"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1011"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>Неверный формат URL репозитория. Операция установки тега будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> <source>Tagging {0} in the Subversion repository</source> <translation>Изменение тегов '{0}' в репозитории Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1101"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1102"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>URL репозитория проекта недоступен из рабочей копии. Операция переключения будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>Неверный формат URL репозитория. Операция переключения будет отменена</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1148"/> <source>Switching to {0}</source> <translation>Преключение на '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1249"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1250"/> <source>Merging {0}</source> <translation>Слияние с '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1512"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1527"/> <source>Cleaning up {0}</source> <translation>Очистка {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1548"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Subversion command</source> <translation>Команда Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1694"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1709"/> <source>Copying {0}</source> <translation>Копирование '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="882"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="883"/> <source>Moving {0}</source> <translation>Перемещение {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1776"/> <source>Subversion Set Property</source> <translation>Установить свойство Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1794"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1809"/> <source>You have to supply a property name. Aborting.</source> <translation>Необходимо задать имя свойства. Прервано.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1812"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> <source>Subversion Delete Property</source> <translation>Удалить свойство Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1632"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1647"/> <source>Enter property name</source> <translation>Задайте имя свойства</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="530"/> <source>Commiting changes to Subversion repository</source> <translation>Фиксация изменений в репозитории Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="585"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="586"/> <source>Synchronizing with the Subversion repository</source> <translation>Синхронизация с репозиторием Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="686"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="687"/> <source>Adding files/directories to the Subversion repository</source> <translation>Добавляю файлы/каталоги в репозиторий Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="785"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="786"/> <source>Adding directory trees to the Subversion repository</source> <translation>Добавляю деревья каталогов в репозиторий Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="820"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> <source>Removing files/directories from the Subversion repository</source> <translation>Удаляю файлы/каталоги из репозитория Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1074"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1075"/> <source>Reverting changes</source> <translation>Отменяю изменения</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1655"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1670"/> <source>Resolving conficts</source> <translation>Разрешаю конфликт</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="221"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> <source>Create project in repository</source> <translation>Создать проект в репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="221"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>Невозможно создать проект в репозитории. Возможно данный репозиторий не существует или сервер не функционирует.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> <source>New project</source> <translation>Новый проект</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>Невозможно загрузить проект из репозитория. <br />Восстанавливаю предыдущее содержимое.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="922"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> <source>Subversion Log</source> <translation>Журнал Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="922"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> <source>Select number of entries to show.</source> <translation>Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1978"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1993"/> <source>Locking in the Subversion repository</source> <translation>Захватываю файл/каталог в репозитории Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2016"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2031"/> <source>Unlocking in the Subversion repository</source> <translation>Освобождаю файл/каталог в репозитории Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="554"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="555"/> <source>Committed revision {0}.</source> <translation>Сохранена ревизия {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1154"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> <source>Revision {0}. </source> <translation>Ревизия {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1792"/> <source>Property set.</source> <translation>Свойство установлено.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1842"/> <source>Property deleted.</source> <translation>Свойство удалено.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1958"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> <source>Subversion Lock</source> <translation>Запереть</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1958"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> <source>Enter lock comment</source> <translation>Задайте комментарий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2076"/> <source>Relocating</source> <translation>Перемещаю</translation> </message> @@ -39423,48 +39448,48 @@ <translation>нет версий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="329"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="330"/> <source>Imported revision {0}. </source> <translation>Импортирована ревизия {0}.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> <source>The svn process finished with the exit code {0}</source> <translation>Процесс svn завершился с кодом {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="195"/> <source>The svn process did not finish within 30s.</source> <translation>Процесс svn не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="196"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="197"/> <source>Could not start the svn executable.</source> <translation>Невозможно запустить исполняемый файл svn.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> <source>Repository Browser</source> <translation>Проводник репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> <source>Enter the repository URL.</source> <translation>Задайте URL репозитория.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2111"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2126"/> <source>Remove from changelist</source> <translation>Удалить из списка изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2162"/> <source>Add to changelist</source> <translation>Добавить к списку изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2137"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2152"/> <source>Enter name of the changelist:</source> <translation>Введите имя списка изменений:</translation> </message> @@ -41020,7 +41045,7 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> <source>Resolve conflict</source> - <translation>Разрешить конфликт</translation> + <translation type="obsolete">Разрешить конфликт</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="636"/> @@ -41122,6 +41147,11 @@ <source>Remove from Changelist</source> <translation>Удалить из списка изменений</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> + <source>Conflict resolved</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -41188,417 +41218,417 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>Add to repository</source> - <translation>Добавить в репозиторий</translation> + <translation type="obsolete">Добавить в репозиторий</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>&Add to repository...</source> - <translation>&Добавить в репозиторий...</translation> + <translation type="obsolete">&Добавить в репозиторий...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="92"/> <source>Add the local project to the VCS repository</source> - <translation>Добавить локальный проект в репозиторий VCS</translation> + <translation type="obsolete">Добавить локальный проект в репозиторий VCS</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="95"/> <source><b>Add to repository</b><p>This adds (imports) the local project to the VCS repository.</p></source> - <translation><b>Добавить в репозиторий</b><p>Добавляет (импортирует) локальный проект в репозиторий VCS.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="102"/> + <translation type="obsolete"><b>Добавить в репозиторий</b><p>Добавляет (импортирует) локальный проект в репозиторий VCS.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>Remove from repository (and disk)</source> <translation>Удаление из репозитория (и с диска)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>&Remove from repository (and disk)</source> <translation>&Удалить из репозитория (и с диска)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="93"/> <source>Remove the local project from the VCS repository (and disk)</source> <translation>Удалить локальный проект из репозитория (и диска)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="109"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="96"/> <source><b>Remove from repository</b><p>This removes the local project from the VCS repository (and disk).</p></source> <translation><b>Удалить из репозитория</b><p>Удалить локальный проект из репозитория. Локальная копия (на диске) также будет удалена.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> <source>Show log</source> <translation>Показать журнал</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> <source>Show &log</source> <translation>Показать &журнал</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="121"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="108"/> <source>Show the log of the local project</source> <translation>Показать журнал изменений локального проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="124"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="111"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Показать журнал</b><p>Показать журнал изменений локального проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/> <source>Show difference</source> <translation>Показать различие</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/> <source>Show &difference</source> <translation>Показать &различие</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="151"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/> <source>Show the difference of the local project to the repository</source> <translation>Показать изменения между репозиторием и локальной копией</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="141"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation><b>Показать различие</b> <p>Показать различие между локальным проектом и репозиторием.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="161"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="148"/> <source>Show difference (extended)</source> <translation>Показать различие (расширенно)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Показать разницу версий между репозиторием и локальной копией</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="155"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation><b>Показать разницу (насширенно)</b><p>Отображает различие выбираемых ревизий проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="177"/> <source>Show status</source> <translation>Показать статус</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="177"/> <source>Show &status</source> <translation>Показать &статус</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="181"/> <source>Show the status of the local project</source> <translation>Показать статус локального проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Показать статус</b><p>Показать статус локального проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>Tag in repository</source> <translation>Создать тег в репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>&Tag in repository...</source> <translation>&Создать тег в репозитории...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> <source>Tag the local project in the repository</source> <translation>Создать в репозитории тег для проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Создать тег</b><p>Создаёт тег для локального проекта в репозитории.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> <source>Export from repository</source> <translation>Экспорт из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> <source>&Export from repository...</source> <translation>&Экспорт из репозитория...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="224"/> + <source>Export a project from the repository</source> + <translation>Экспортировать проект из репозитория</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="227"/> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>Экспорт из репозитория</b><p>Экспортировать проект из репозитория.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <source>Command options</source> + <translation>Опции командной строки</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <source>Command &options...</source> + <translation>&Опции командной строки...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> - <source>Export a project from the repository</source> - <translation>Экспортировать проект из репозитория</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="240"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation><b>Экспорт из репозитория</b><p>Экспортировать проект из репозитория.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> - <source>Command options</source> - <translation>Опции командной строки</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> - <source>Command &options...</source> - <translation>&Опции командной строки...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="250"/> <source>Show the VCS command options</source> <translation>Показать опции командной строки VCS</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="251"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> <translation><b>Опции командной строки...</b><p>Показать диалог для редактирования опций командной строки VCS.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Re&vert changes</source> <translation>От&мена изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> <source>Revert all changes made to the local project</source> <translation>Отменить все изменения в локальном проекте</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="265"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Отмена изменений</b><p>Все изменения в локальном проекте будут отменены.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> <source>Merge</source> <translation>Слить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> <source>Mer&ge changes...</source> <translation>С&лить изменения...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="263"/> <source>Merge changes of a tag/revision into the local project</source> <translation>Слить изменения тега/ревизии с локальным проектом</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="279"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>Слить</b><p>Слить изменения тега/ревизии с локальным проектом.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> <source>Switch</source> <translation>Переключиться</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> <source>S&witch...</source> <translation>Пе&реключиться...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> <source>Switch the local copy to another tag/branch</source> <translation>Переключить локальную копию на другой тег/ветвь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>Переключиться</b><p>Переключить локальную копию на другой тег/ветвь.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Resolve conflicts</source> - <translation>Разрешение конфликтов</translation> + <translation type="obsolete">Разрешение конфликтов</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Resolve con&flicts</source> - <translation>Разрешение кон&фликтов</translation> + <translation type="obsolete">Разрешение кон&фликтов</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> <source>Resolve all conflicts of the local project</source> - <translation>Разрешить все конфликты, возникшие в локальном проекте</translation> + <translation type="obsolete">Разрешить все конфликты, возникшие в локальном проекте</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> - <translation><b>Разрешение конфликтов</b><p>Разрешает конфликты, возникшие при обновлении локальной копии с репозитория.</p></translation> + <translation type="obsolete"><b>Разрешение конфликтов</b><p>Разрешает конфликты, возникшие при обновлении локальной копии с репозитория.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <source>Cleanup</source> + <translation>Очистка</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <source>Cleanu&p</source> + <translation>О&чистка</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> + <source>Cleanup the local project</source> + <translation>Очистить локальный проект</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Очистка</b><p>Очистить локальный проект.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> - <source>Cleanup</source> - <translation>Очистка</translation> + <source>Execute command</source> + <translation>Выполнить команду</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> - <source>Cleanu&p</source> - <translation>О&чистка</translation> + <source>E&xecute command...</source> + <translation>В&ыполнить команду...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> - <source>Cleanup the local project</source> - <translation>Очистить локальный проект</translation> + <source>Execute an arbitrary VCS command</source> + <translation>Выполнить произвольную команду VCS</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Очистка</b><p>Очистить локальный проект.</p></translation> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> + <translation><b>Выполнить команду</b><p>Открыть диалог для ввода произвольной команды VCS.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> - <source>Execute command</source> - <translation>Выполнить команду</translation> + <source>List tags</source> + <translation>Список тегов</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> - <source>E&xecute command...</source> - <translation>В&ыполнить команду...</translation> + <source>List tags...</source> + <translation>Список тегов...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> - <source>Execute an arbitrary VCS command</source> - <translation>Выполнить произвольную команду VCS</translation> + <source>List tags of the project</source> + <translation>Список тегов текущего проекта</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> - <translation><b>Выполнить команду</b><p>Открыть диалог для ввода произвольной команды VCS.</p></translation> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>Список тегов</b><p>Отображает список тегов текущего проекта.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> - <source>List tags</source> - <translation>Список тегов</translation> + <source>List branches</source> + <translation>Список ветвей</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> - <source>List tags...</source> - <translation>Список тегов...</translation> + <source>List branches...</source> + <translation>Список ветвей...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> - <source>List tags of the project</source> - <translation>Список тегов текущего проекта</translation> + <source>List branches of the project</source> + <translation>Список ветвей текущего проекта</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>Список тегов</b><p>Отображает список тегов текущего проекта.</p></translation> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Список ветвей</b> +<p>Отображает список ветвей текущего проекта.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> - <source>List branches</source> - <translation>Список ветвей</translation> + <source>List repository contents</source> + <translation>Просмотреть содержимое репозитория</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> - <source>List branches...</source> - <translation>Список ветвей...</translation> + <source>List repository contents...</source> + <translation>Просмотреть содержимое репозитория...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> - <source>List branches of the project</source> - <translation>Список ветвей текущего проекта</translation> + <source>Lists the contents of the repository</source> + <translation>Просмотреть содержимое репозитория</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Список ветвей</b> -<p>Отображает список ветвей текущего проекта.</p></translation> + <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> + <translation><b>Просмотреть содержимое репозитория<b><p>Просмотреть содержимое репозитория системы контроля версий.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> - <source>List repository contents</source> - <translation>Просмотреть содержимое репозитория</translation> + <source>Set Property</source> + <translation>Установить свойство</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> - <source>List repository contents...</source> - <translation>Просмотреть содержимое репозитория...</translation> + <source>Set Property...</source> + <translation>Установить свойство...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> - <source>Lists the contents of the repository</source> - <translation>Просмотреть содержимое репозитория</translation> + <source>Set a property for the project files</source> + <translation>Установить свойство файлов проекта</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> - <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> - <translation><b>Просмотреть содержимое репозитория<b><p>Просмотреть содержимое репозитория системы контроля версий.</p></translation> + <source><b>Set Property</b><p>This sets a property for the project files.</p></source> + <translation><b>Установить свойство</b><p>Устанавливает свойство файлов проекта.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> - <source>Set Property</source> - <translation>Установить свойство</translation> + <source>List Properties</source> + <translation>Список свойств</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> - <source>Set Property...</source> - <translation>Установить свойство...</translation> + <source>List Properties...</source> + <translation>Список свойств...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> - <source>Set a property for the project files</source> - <translation>Установить свойство файлов проекта</translation> + <source>List properties of the project files</source> + <translation>Список свойств файлов проекта</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> - <source><b>Set Property</b><p>This sets a property for the project files.</p></source> - <translation><b>Установить свойство</b><p>Устанавливает свойство файлов проекта.</p></translation> + <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> + <translation><b>Список свойств</b><p>Отображает список свойств файлов проекта.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> - <source>List Properties</source> - <translation>Список свойств</translation> + <source>Delete Property</source> + <translation>Удалить свойство</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> - <source>List Properties...</source> - <translation>Список свойств...</translation> + <source>Delete Property...</source> + <translation>Удалить свойство...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> - <source>List properties of the project files</source> - <translation>Список свойств файлов проекта</translation> + <source>Delete a property for the project files</source> + <translation>Удалить свойство для файлов проекта</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> - <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> - <translation><b>Список свойств</b><p>Отображает список свойств файлов проекта.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> - <source>Delete Property</source> - <translation>Удалить свойство</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> - <source>Delete Property...</source> - <translation>Удалить свойство...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> - <source>Delete a property for the project files</source> - <translation>Удалить свойство для файлов проекта</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="410"/> <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> <translation><b>Удалить свойство</b> <p>Удаляет свойство для файлов проекта.</p></translation> @@ -41619,110 +41649,130 @@ <translation type="obsolete"><b>Показать ограниченный журнал</b><p>Отображает журнал с заданным количеством элементов.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="204"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> <source>Show repository info</source> <translation>Показать информацию о репозитории</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="208"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> <source>Show some repository related information for the local project</source> <translation>Отобразить информацию о репозизтории локального проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> <source>Relocate</source> <translation>Переместить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> <source>Relocate...</source> <translation>Переместить...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="408"/> <source>Relocate the working copy to a new repository URL</source> <translation>Переместить рабочую копию в репозиторий с новым URL</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="424"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="411"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>Переместить</b><p>Переместить рабочую копию в репозиторий с новым URL.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation><b>Информация о репозитории</b><p>Отобразить информацию о репозитории локального проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="175"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="162"/> <source>Show difference (URLs)</source> <translation>Показать разницу (URL)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="166"/> <source>Show the difference of the project between two repository URLs</source> <translation>Показать разницу между двумя репозиториями</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> <source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source> <translation><b>Показать разницу (URL)</b><p>Показывает разницу между репозиториями, заданными двумя URL.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> <source>Repository Browser</source> <translation>Проводник репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> <source>Repository Browser...</source> <translation>Проводник репозитория...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <source>Show the Repository Browser dialog</source> + <translation>Показать диалог проводника репозитория</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation><b>Проводник репозитория</b><p>Показывает проводник репозитория.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="118"/> + <source>Show log browser</source> + <translation>Показать проводник журналов</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/> + <source>Show a dialog to browse the log of the local project</source> + <translation>Показать диалог для навигации по файлу журнала для локального проекта</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="125"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation><b>Показать проводник журнала</b><p>Показывает диалог для навигации по файлу журнала локального проекта. Изначально показывается ограниченное количество записей. Дальнейшие записи могут быть получены позже.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <source>Configure</source> + <translation>Настроить</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <source>Configure...</source> + <translation>Настроить...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> - <source>Show the Repository Browser dialog</source> - <translation>Показать диалог проводника репозитория</translation> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation>Показать диалог настроек с выбранной страницей настроек Subversion</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation><b>Проводник репозитория</b><p>Показывает проводник репозитория.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> - <source>Show log browser</source> - <translation>Показать проводник журналов</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="135"/> - <source>Show a dialog to browse the log of the local project</source> - <translation>Показать диалог для навигации по файлу журнала для локального проекта</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/> - <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> - <translation><b>Показать проводник журнала</b><p>Показывает диалог для навигации по файлу журнала локального проекта. Изначально показывается ограниченное количество записей. Дальнейшие записи могут быть получены позже.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> - <source>Configure</source> - <translation>Настроить</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> - <source>Configure...</source> - <translation>Настроить...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> - <source>Show the configuration dialog with the Subversion page selected</source> - <translation>Показать диалог настроек с выбранной страницей настроек Subversion</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation><b>Настроить</b><p>Показать диалог настроек с выбранной страницей настроек Subversion.</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnPropDelDialog</name> @@ -50666,17 +50716,17 @@ <context> <name>VersionControl</name> <message> - <location filename="VCS/VersionControl.py" line="536"/> + <location filename="VCS/VersionControl.py" line="547"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="536"/> + <location filename="VCS/VersionControl.py" line="547"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс '{0}'. Убедитесь, что он находится в пути поиска.</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="662"/> + <location filename="VCS/VersionControl.py" line="673"/> <source>Repository status checking is switched off</source> <translation>Проверка статуса репозитория отключена</translation> </message> @@ -54392,17 +54442,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1733"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Метки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1741"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Ветви</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1734"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/> <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> @@ -54413,30 +54463,30 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>Tip</b></td><td></td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Изменения</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1745"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1236"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Предок #{0}</b></td><td></td></tr> <tr><td><b>Изменения</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1252"/> <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> @@ -54446,7 +54496,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -54463,7 +54513,7 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -54707,17 +54757,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1589"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1604"/> <source>unknown</source> <translation>неизвестный</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1458"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1473"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Информация о репозитории</h3><table><tr><td><b>Версия Subversion:</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Текущая ревизия</b></td><td>{2}</td></tr><tr><td><b>Зафиксированная ревизия (committed)</b></td><td>{3}</td></tr><tr><td><b>Дата сохранения</b></td><td>{4}</td></tr><tr><td><b>Время сохранения</b></td><td>{5}</td></tr><tr><td><b>Последний автор</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1590"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>Информация о репозитории</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Текущая ревизия</b></td><td>{4}</td></tr><tr><td><b>Зафиксированная ревизия</b></td><td>{5}</td></tr><tr><td><b>Дата сохранения</b></td><td>{6}</td></tr><tr><td><b>Время сохранения</b></td><td>{7}</td></tr><tr><td><b>Автор последней ревизии</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_tr.ts Mon May 28 15:59:36 2012 +0200 +++ b/i18n/eric5_tr.ts Tue May 29 20:59:40 2012 +0200 @@ -16963,87 +16963,87 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="252"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="254"/> + <source>The hg process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="256"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> <source>Create project repository</source> <translation>Bilgi havuzu projesi oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="310"/> <source>Creating Mercurial repository</source> <translation>Mercurial kaynak havauzu oluşturuluyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="325"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="369"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="371"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="533"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="585"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="647"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="649"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/> <source>Renaming {0}</source> <translation>Yenşden adlandırılıyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="840"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="842"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="873"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="875"/> <source>Reverting changes</source> <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="925"/> <source>Merging</source> <translation>Birleştiriliyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1176"/> <source>Mercurial command</source> <translation>Mercurial komut</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1352"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> @@ -17058,192 +17058,192 @@ <translation type="obsolete">Gösterilecek giriş sayısını seçiniz.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1597"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1611"/> <source>Pulling from a remote Mercurial repository</source> <translation>Uzak Mercurial kaynak havuzundan çekiliyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1650"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> <source>Create Branch</source> <translation>Sınıf(Branş) Oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> <source>Enter branch name</source> <translation>Sınıf(Branş) adını gir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1839"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1882"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1976"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p><b>{0}</b> dosyası halihazırda bulunuyor. Üzerine yazılsın mı?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <source>Create changegroup</source> <translation>Değişimgrubu oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Değiştirme grubu Dosyaları (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2185"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial Değişimgrubu Dosyaları (*.hg);;Tüm Dosyalar (*)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2305"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2367"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2381"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="479"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="481"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -19827,7 +19827,7 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> <source>Resolve conflict</source> - <translation>Çelişkiyi çözümle</translation> + <translation type="obsolete">Çelişkiyi çözümle</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> @@ -19859,6 +19859,11 @@ <source>Do you really want to remove these files from the repository?</source> <translation>Bu dosyaları gerçekten kaynak havuzundan kaldırmak istiyor musunuz?</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> + <source>Conflict resolved</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -20005,60 +20010,50 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Add to repository</source> - <translation>Kaynak havuzuna ekle</translation> + <translation type="obsolete">Kaynak havuzuna ekle</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>&Add to repository...</source> - <translation>K&aynak havuzuna ekle...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="225"/> - <source>Add the local project to the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228"/> - <source><b>Add to repository</b><p>This adds (imports) the local project to the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <translation type="obsolete">K&aynak havuzuna ekle...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Remove from repository (and disk)</source> <translation>Kaynak havuzundan kaldır (ve diskten)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>&Remove from repository (and disk)</source> <translation>Kaynak havuzundan kaldı&r (ve diskten)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="239"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> <source>Remove the local project from the repository (and disk)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> <source><b>Remove from repository</b><p>This removes the local project from the repository (and disk).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Show log</source> <translation>Kayıtı göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Show &log</source> <translation>Kayıtı &göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241"/> <source>Show the log of the local project</source> <translation>Yerel projenin günlük kaydını göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="257"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="244"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation type="unfinished"></translation> </message> @@ -20068,652 +20063,642 @@ <translation type="obsolete">Sınırlı kayıtı göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>Show log browser</source> <translation>Kayıt gözatıcısını gösted</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="255"/> <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> + <source>Show difference</source> + <translation>Farkları göster</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> + <source>Show &difference</source> + <translation>Farkları gös&ter</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> - <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> - <source>Show difference</source> - <translation>Farkları göster</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> - <source>Show &difference</source> - <translation>Farkları gös&ter</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> <source>Show difference (extended)</source> <translation>Farkları göster (gelişmiş)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show status</source> <translation>Durumu Göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show &status</source> <translation>Durumu gö&ster</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> + <source>Show the status of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <source>Show heads</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> - <source>Show the status of the local project</source> + <source>Show the heads of the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> - <source>Show heads</source> + <source>Show parents</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> - <source>Show the heads of the repository</source> + <source>Show the parents of the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="328"/> - <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> + <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> - <source>Show parents</source> + <source>Show tip</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> - <source>Show the parents of the repository</source> + <source>Show the tip of the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="341"/> - <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> + <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> - <source>Show tip</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="351"/> - <source>Show the tip of the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/> - <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Revert changes</source> <translation>Değişiklikleri başa döndür</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> <source>Re&vert changes</source> <translation>Değişiklikleri ba&şa döndür</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/> <source>Revert all changes made to the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Merge</source> <translation>Birleştir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Mer&ge changes...</source> <translation>De&ğişiklikleri birleştir...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> <source>Merge changes of a revision into the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve conflicts</source> - <translation>Çelişkileri çözümle</translation> + <translation type="obsolete">Çelişkileri çözümle</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve con&flicts</source> - <translation>Çelişkileri çö&zümle</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="392"/> - <source>Resolve all conflicts of the local project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> - <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> + <translation type="obsolete">Çelişkileri çö&zümle</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Tag in repository</source> <translation>Kaynak havuzu etiketi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>&Tag in repository...</source> <translation>Kaynak havuzu e&tiketi...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> + <source>Tag the local project in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <source>List tags</source> + <translation>Etiketleri listele</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <source>List tags...</source> + <translation>Etiketleri listele...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> - <source>Tag the local project in the repository</source> + <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="409"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>List tags</source> - <translation>Etiketleri listele</translation> + <source>List branches</source> + <translation>Branşlar listesi</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>List tags...</source> - <translation>Etiketleri listele...</translation> + <source>List branches...</source> + <translation>Branşlar listesi...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> - <source>List tags of the project</source> - <translation type="unfinished"></translation> + <source>List branches of the project</source> + <translation>Prosenin branşlar listesi</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Branş listesi</b><p>Bu listeler prosenin branş listeleridir.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> + <source>Create branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source>List branches</source> - <translation>Branşlar listesi</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source>List branches...</source> - <translation>Branşlar listesi...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/> - <source>List branches of the project</source> - <translation>Prosenin branşlar listesi</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Branş listesi</b><p>Bu listeler prosenin branş listeleridir.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> - <source>Create branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> <source>Create &branch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> <source>Create a new branch for the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> + <source>Close branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> + <source>Close the current branch of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> + <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> - <source>Close branch</source> + <source>Show current branch</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> - <source>Close the current branch of the local project</source> + <source>Show the current branch of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> - <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> + <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> - <source>Show current branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> - <source>Show the current branch of the project</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> - <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> <source>Switch</source> <translation>Değiştirmek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source>S&witch...</source> <translation>Deği&ştirmek...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> + <source>Switch the working directory to another revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="491"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <source>Cleanup</source> + <translation>Temizle</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <source>Cleanu&p</source> + <translation>Temi&zle</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> - <source>Switch the working directory to another revision</source> - <translation type="unfinished"></translation> + <source>Cleanup the local project</source> + <translation>Yerel projeyi temizle</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> - <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Temizle</b><p>Bu yerel projeyi sıfırlar.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> + <source>Execute command</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> - <source>Cleanup</source> - <translation>Temizle</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> - <source>Cleanu&p</source> - <translation>Temi&zle</translation> + <source>E&xecute command...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> - <source>Cleanup the local project</source> - <translation>Yerel projeyi temizle</translation> + <source>Execute an arbitrary Mercurial command</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Temizle</b><p>Bu yerel projeyi sıfırlar.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> - <source>Execute command</source> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> - <source>E&xecute command...</source> - <translation type="unfinished"></translation> + <source>Command options</source> + <translation>Komut seçenekleri</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> + <source>Command &options...</source> + <translation>K&omut seçenekleri...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>Execute an arbitrary Mercurial command</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> - <source>Command options</source> - <translation>Komut seçenekleri</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> - <source>Command &options...</source> - <translation>K&omut seçenekleri...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>Show the Mercurial command options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Configure</source> + <translation>Yapılandırma</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Configure...</source> + <translation>Ayarlanıyor...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <source>Show the configuration dialog with the Mercurial page selected</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> - <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> - <source>Configure</source> - <translation>Yapılandırma</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> - <source>Configure...</source> - <translation>Ayarlanıyor...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> - <source>Show the configuration dialog with the Mercurial page selected</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <source>Show paths</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <source>Show paths...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <source>Show the aliases for remote repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> - <source>Show paths</source> + <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> - <source>Show paths...</source> + <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> - <source>Show the aliases for remote repositories</source> + <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Verify repository</source> + <source>Recover</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Verify repository...</source> + <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> - <source>Verify the integrity of the repository</source> + <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> + <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> - <source>Recover</source> + <source>Identify</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> - <source>Recover...</source> + <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> - <source>Recover from an interrupted transaction</source> + <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> - <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> - <source>Identify</source> + <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> - <source>Identify...</source> + <source>Create .hgignore</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> - <source>Identify the project directory</source> + <source>Create a .hgignore file with default values</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> - <source><b>Identify</b><p>This identifies the project directory.</p></source> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> - <source>Create .hgignore</source> + <source>Create changegroup</source> + <translation>Değişimgrubu oluştur</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> - <source>Create a .hgignore file with default values</source> + <source>Create changegroup file collecting changesets</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Create changegroup</source> - <translation>Değişimgrubu oluştur</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Create changegroup...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> - <source>Create changegroup file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Preview changegroup</source> <translation>Değişimgrubu öngörünümü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="671"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Identify changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Identify changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Mark as "good"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <source>Mark a selectable changeset as good</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> - <source>Mark as "good"</source> + <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> - <source>Mark as "good"...</source> + <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> - <source>Mark a selectable changeset as good</source> + <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Mark as "bad"</source> + <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Mark as "bad"...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> - <source>Mark a selectable changeset as bad</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> - <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> - <translation type="unfinished"></translation> + <source>Skip</source> + <translation>Atla</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> - <source>Skip</source> - <translation>Atla</translation> + <source>Reset</source> + <translation>Başadön</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <source>Reset the bisect search data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> - <source>Reset</source> - <translation>Başadön</translation> + <source>Back out changeset</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> - <source>Reset the bisect search data</source> + <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> - <source>Back out changeset</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> - <source>Back out changes of an earlier changeset</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> @@ -20733,260 +20718,280 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094"/> <source>Pull</source> <translation>Çekmek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> <source>The project should be reread. Do this now?</source> <translation>Projenin yeniden okunması gerekiyor. Şimdi yapılsın mı?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care.</strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> + <source>Show an editor to edit the user configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit user configuration</source> + <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit user configuration...</source> + <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> - <source>Show an editor to edit the user configuration file</source> + <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Edit repository configuration</source> + <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> - <source>Show an editor to edit the repository configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="578"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1311"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Import Patch...</source> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> - <source>Import a patch from a patch file</source> + <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> - <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> - <source>Patch Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344"/> - <source>Revert Changes</source> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> - <source>Export Patches</source> + <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> - <source>Export Patches...</source> + <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/> - <source>Export revisions to patch files</source> + <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> - <source>Change Phase...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> - <source>Change the phase of revisions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1349"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856"/> + <source>Copies changesets from another branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> - <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -30517,7 +30522,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3901"/> + <location filename="Project/Project.py" line="3903"/> <source>Profile Data</source> <translation>Veri Kesiti</translation> </message> @@ -30537,7 +30542,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3954"/> + <location filename="Project/Project.py" line="3956"/> <source>Application Diagram</source> <translation>Uygulama Şeması</translation> </message> @@ -30557,7 +30562,7 @@ <translation><b>Uygulama Şeması...</b><p>Bu projenin bir şemasını gösterir.</p></translation> </message> <message> - <location filename="Project/Project.py" line="4085"/> + <location filename="Project/Project.py" line="4087"/> <source>Create Package List</source> <translation>Paket Listesini Oluştur</translation> </message> @@ -30577,7 +30582,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4245"/> + <location filename="Project/Project.py" line="4247"/> <source>Create Plugin Archive</source> <translation>Eklenti Arşivi Oluştur</translation> </message> @@ -30702,77 +30707,77 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="3834"/> + <location filename="Project/Project.py" line="3836"/> <source>Coverage Data</source> <translation>Veri Kapsamı</translation> </message> <message> - <location filename="Project/Project.py" line="3880"/> + <location filename="Project/Project.py" line="3882"/> <source>There is no main script defined for the current project. Aborting</source> <translation>Bugeçerli projede tanımlanan ana betik değil. Durduruluyor</translation> </message> <message> - <location filename="Project/Project.py" line="3855"/> + <location filename="Project/Project.py" line="3857"/> <source>Code Coverage</source> <translation>Kod Koruyucu</translation> </message> <message> - <location filename="Project/Project.py" line="3855"/> + <location filename="Project/Project.py" line="3857"/> <source>Please select a coverage file</source> <translation>Lütfen bir koruyucu dosya seçiniz</translation> </message> <message> - <location filename="Project/Project.py" line="3901"/> + <location filename="Project/Project.py" line="3903"/> <source>Please select a profile file</source> <translation>Lütfen kesit dosyasını seçiniz</translation> </message> <message> - <location filename="Project/Project.py" line="3954"/> + <location filename="Project/Project.py" line="3956"/> <source>Include module names?</source> <translation>Modül isimleri dahil edilsin mi?</translation> </message> <message> - <location filename="Project/Project.py" line="4058"/> + <location filename="Project/Project.py" line="4060"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4085"/> + <location filename="Project/Project.py" line="4087"/> <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4102"/> + <location filename="Project/Project.py" line="4104"/> <source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4110"/> + <location filename="Project/Project.py" line="4112"/> <source>The project does not have a main script defined. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4122"/> + <location filename="Project/Project.py" line="4124"/> <source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4133"/> + <location filename="Project/Project.py" line="4135"/> <source><p>The eric5 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4153"/> + <location filename="Project/Project.py" line="4155"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4165"/> + <location filename="Project/Project.py" line="4167"/> <source><p>The eric5 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4245"/> + <location filename="Project/Project.py" line="4247"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -38945,270 +38950,270 @@ <context> <name>Subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> <source>The svn process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="195"/> <source>The svn process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="196"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="197"/> <source>Could not start the svn executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="221"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> <source>Create project in repository</source> <translation>Bilgi havuzunda proje oluştur</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="221"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>Proje bilgi havuzunda oluşturulamadı. Belki verilen bilgi havuzu yoktur yada bilgi havuzunun serveri bozuktur.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> <source>New project</source> <translation>Yeni Proje</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>Proje bilgi havuzundan kontrol edilemiyor.<br />Orjinal içerik eski haline getiriliyor.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="314"/> <source>Importing project into Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="363"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="364"/> <source>Subversion Checkout</source> <translation>Altsürüm Kontrolü</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="385"/> <source>Checking project out of Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> <source>Subversion Export</source> <translation>Altsürüm Dışaaktarma</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="445"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="446"/> <source>Exporting project from Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="530"/> <source>Commiting changes to Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="585"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="586"/> <source>Synchronizing with the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="686"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="687"/> <source>Adding files/directories to the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="785"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="786"/> <source>Adding directory trees to the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="820"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> <source>Removing files/directories from the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="882"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="883"/> <source>Moving {0}</source> <translation>Taşınıyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> <source>Subversion Error</source> <translation>Altsürüm Hatası</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="986"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="987"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1010"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1011"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> <source>Tagging {0} in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1074"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1075"/> <source>Reverting changes</source> <translation>Değişiklikler eski haline alınıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1101"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1102"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1148"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1249"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1250"/> <source>Merging {0}</source> <translation>Birleştiriliyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1512"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1527"/> <source>Cleaning up {0}</source> <translation>Temizle {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1548"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Subversion command</source> <translation>Altsürüm komutu</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1655"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1670"/> <source>Resolving conficts</source> <translation>Çelişki çözümleniyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1694"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1709"/> <source>Copying {0}</source> <translation>Kopyalanıyor {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1776"/> <source>Subversion Set Property</source> <translation>Altsürüm Özelliklerini Ayarla</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1794"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1809"/> <source>You have to supply a property name. Aborting.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1812"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> <source>Subversion Delete Property</source> <translation>Altsürüm Silme Önceliği</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1632"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1647"/> <source>Enter property name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="922"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> <source>Subversion Log</source> <translation>Altsürüm Kayıtı</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="922"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> <source>Select number of entries to show.</source> <translation>Gösterilecek giriş sayısını seçiniz.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1978"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1993"/> <source>Locking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2016"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2031"/> <source>Unlocking in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2076"/> <source>Relocating</source> <translation>Yeniden konumlandırılıyor</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> <source>Repository Browser</source> <translation>Kaynak Havuzu Gözatıcısı</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> <source>Enter the repository URL.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2111"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2126"/> <source>Remove from changelist</source> <translation>Değişiklik listesinden çıkar</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2162"/> <source>Add to changelist</source> <translation>Değişiklik listesine ekle</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2137"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2152"/> <source>Enter name of the changelist:</source> <translation>Değişiklik listesi adını giriniz:</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="329"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="330"/> <source>Imported revision {0}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="554"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="555"/> <source>Committed revision {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1154"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> <source>Revision {0}. </source> <translation>Gözden geçirme {0}. </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1792"/> <source>Property set.</source> <translation>Özellikleri Ayarla.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1842"/> <source>Property deleted.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1958"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> <source>Subversion Lock</source> <translation>Altsürüm Kilidi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1958"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> <source>Enter lock comment</source> <translation type="unfinished"></translation> </message> @@ -40932,7 +40937,7 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> <source>Resolve conflict</source> - <translation>Çelişkiyi çözümle</translation> + <translation type="obsolete">Çelişkiyi çözümle</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="388"/> @@ -40999,6 +41004,11 @@ <source>Show repository info</source> <translation>Kaynak havuzu bilgisini göster</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> + <source>Conflict resolved</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -41065,60 +41075,60 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>Add to repository</source> - <translation>Kaynak havuzuna ekle</translation> + <translation type="obsolete">Kaynak havuzuna ekle</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>&Add to repository...</source> - <translation>K&aynak havuzuna ekle...</translation> + <translation type="obsolete">K&aynak havuzuna ekle...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="92"/> <source>Add the local project to the VCS repository</source> - <translation>VCS kaynak havuzuna yerel proje ekle</translation> + <translation type="obsolete">VCS kaynak havuzuna yerel proje ekle</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="95"/> <source><b>Add to repository</b><p>This adds (imports) the local project to the VCS repository.</p></source> - <translation><b>Kaynak havuzuna ekle</b><p>Bu yerel projeyi kaynak havuzana ekler ( aktarır).</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="102"/> + <translation type="obsolete"><b>Kaynak havuzuna ekle</b><p>Bu yerel projeyi kaynak havuzana ekler ( aktarır).</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>Remove from repository (and disk)</source> <translation>Kaynak havuzundan kaldır (ve diskten)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>&Remove from repository (and disk)</source> <translation>Kaynak havuzundan kaldı&r (ve diskten)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="93"/> <source>Remove the local project from the VCS repository (and disk)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="109"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="96"/> <source><b>Remove from repository</b><p>This removes the local project from the VCS repository (and disk).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> <source>Show log</source> <translation>Kayıtı göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> <source>Show &log</source> <translation>Kayıtı &göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="121"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="108"/> <source>Show the log of the local project</source> <translation>Yerel projenin günlük kaydını göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="124"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="111"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation type="unfinished"></translation> </message> @@ -41128,465 +41138,475 @@ <translation type="obsolete">Sınırlı kayıtı göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="118"/> <source>Show log browser</source> <translation>Kayıt gözatıcısını gösted</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/> <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="125"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/> + <source>Show difference</source> + <translation>Farkları göster</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/> + <source>Show &difference</source> + <translation>Farkları gös&ter</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/> - <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> - <source>Show difference</source> - <translation>Farkları göster</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> - <source>Show &difference</source> - <translation>Farkları gös&ter</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="151"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="141"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="161"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="148"/> <source>Show difference (extended)</source> <translation>Farkları göster (gelişmiş)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="155"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="175"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="162"/> <source>Show difference (URLs)</source> <translation>Farkları göster (URL'ler)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="166"/> <source>Show the difference of the project between two repository URLs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> <source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="177"/> <source>Show status</source> <translation>Durumu Göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="177"/> <source>Show &status</source> <translation>Durumu gö&ster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="181"/> <source>Show the status of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>Tag in repository</source> <translation>Kaynak havuzu etiketi</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>&Tag in repository...</source> <translation>Kaynak havuzu e&tiketi...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> <source>Tag the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> <source>Export from repository</source> <translation>Kaynak havuzundan ihraç et</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> <source>&Export from repository...</source> <translation>Dışarı kaynak havuzundan ihraç &et...</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="224"/> + <source>Export a project from the repository</source> + <translation>Dışa Kaynak havuzundan proje aktar</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="227"/> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>Kaynak havuzundan dışa aktar</b><p>Bu kaynak havuzundan bir projeyi dışa aktarır.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <source>Command options</source> + <translation>Komut seçenekleri</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <source>Command &options...</source> + <translation>K&omut seçenekleri...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> - <source>Export a project from the repository</source> - <translation>Dışa Kaynak havuzundan proje aktar</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="240"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation><b>Kaynak havuzundan dışa aktar</b><p>Bu kaynak havuzundan bir projeyi dışa aktarır.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> - <source>Command options</source> - <translation>Komut seçenekleri</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> - <source>Command &options...</source> - <translation>K&omut seçenekleri...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="250"/> <source>Show the VCS command options</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="251"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Revert changes</source> <translation>Değişiklikleri başa döndür</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Re&vert changes</source> <translation>Değişiklikleri ba&şa döndür</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> <source>Revert all changes made to the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="265"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> <source>Merge</source> <translation>Birleştir</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> <source>Mer&ge changes...</source> <translation>De&ğişiklikleri birleştir...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="263"/> <source>Merge changes of a tag/revision into the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="279"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> <source>Switch</source> <translation>Değiştirmek</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> <source>S&witch...</source> <translation>Deği&ştirmek...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> <source>Switch the local copy to another tag/branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Resolve conflicts</source> - <translation>Çelişkileri çözümle</translation> + <translation type="obsolete">Çelişkileri çözümle</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Resolve con&flicts</source> - <translation>Çelişkileri çö&zümle</translation> + <translation type="obsolete">Çelişkileri çö&zümle</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <source>Cleanup</source> + <translation>Temizle</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <source>Cleanu&p</source> + <translation>Temi&zle</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> - <source>Resolve all conflicts of the local project</source> - <translation type="unfinished"></translation> + <source>Cleanup the local project</source> + <translation>Yerel projeyi temizle</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> - <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>Temizle</b><p>Bu yerel projeyi sıfırlar.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <source>Execute command</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> - <source>Cleanup</source> - <translation>Temizle</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> - <source>Cleanu&p</source> - <translation>Temi&zle</translation> + <source>E&xecute command...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> - <source>Cleanup the local project</source> - <translation>Yerel projeyi temizle</translation> + <source>Execute an arbitrary VCS command</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>Temizle</b><p>Bu yerel projeyi sıfırlar.</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> - <source>Execute command</source> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> - <source>E&xecute command...</source> - <translation type="unfinished"></translation> + <source>List tags</source> + <translation>Etiketleri listele</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> + <source>List tags...</source> + <translation>Etiketleri listele...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> - <source>Execute an arbitrary VCS command</source> + <source>List tags of the project</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> - <source>List tags</source> - <translation>Etiketleri listele</translation> + <source>List branches</source> + <translation>Branşlar listesi</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> - <source>List tags...</source> - <translation>Etiketleri listele...</translation> + <source>List branches...</source> + <translation>Branşlar listesi...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> - <source>List tags of the project</source> - <translation type="unfinished"></translation> + <source>List branches of the project</source> + <translation>Prosenin branşlar listesi</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation type="unfinished"></translation> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>Branş listesi</b><p>Bu listeler prosenin branş listeleridir.</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> - <source>List branches</source> - <translation>Branşlar listesi</translation> + <source>List repository contents</source> + <translation>Kaynak Havuzu içeriğini listele</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> - <source>List branches...</source> - <translation>Branşlar listesi...</translation> + <source>List repository contents...</source> + <translation>Kaynak Havuzu içeriğini listele...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> - <source>List branches of the project</source> - <translation>Prosenin branşlar listesi</translation> + <source>Lists the contents of the repository</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>Branş listesi</b><p>Bu listeler prosenin branş listeleridir.</p></translation> + <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> - <source>List repository contents</source> - <translation>Kaynak Havuzu içeriğini listele</translation> + <source>Set Property</source> + <translation>Özellikleri Ayarla</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> - <source>List repository contents...</source> - <translation>Kaynak Havuzu içeriğini listele...</translation> + <source>Set Property...</source> + <translation>Özellikleri Ayarla...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> - <source>Lists the contents of the repository</source> + <source>Set a property for the project files</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> - <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> + <source><b>Set Property</b><p>This sets a property for the project files.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> - <source>Set Property</source> - <translation>Özellikleri Ayarla</translation> + <source>List Properties</source> + <translation>Özellikleri Listele</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> - <source>Set Property...</source> - <translation>Özellikleri Ayarla...</translation> + <source>List Properties...</source> + <translation>Özellikler Listeleniyor...</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> - <source>Set a property for the project files</source> - <translation type="unfinished"></translation> + <source>List properties of the project files</source> + <translation>Proje dosyalarının özelliklerin listele</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> - <source><b>Set Property</b><p>This sets a property for the project files.</p></source> + <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> - <source>List Properties</source> - <translation>Özellikleri Listele</translation> + <source>Delete Property</source> + <translation>Özellikleri Sil</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> - <source>List Properties...</source> - <translation>Özellikler Listeleniyor...</translation> + <source>Delete Property...</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> - <source>List properties of the project files</source> - <translation>Proje dosyalarının özelliklerin listele</translation> + <source>Delete a property for the project files</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> - <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> + <source>Relocate</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> - <source>Delete Property</source> - <translation>Özellikleri Sil</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> - <source>Delete Property...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> - <source>Delete a property for the project files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="410"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> - <source>Relocate</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> <source>Relocate...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="408"/> <source>Relocate the working copy to a new repository URL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="424"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="411"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> <source>Repository Browser</source> <translation>Kaynak Havuzu Gözatıcısı</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> <source>Repository Browser...</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <source>Show the Repository Browser dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <source>Configure</source> + <translation>Yapılandırma</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <source>Configure...</source> + <translation>Ayarlanıyor...</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> - <source>Show the Repository Browser dialog</source> + <source>Show the configuration dialog with the Subversion page selected</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> - <source>Configure</source> - <translation>Yapılandırma</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> - <source>Configure...</source> - <translation>Ayarlanıyor...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> - <source>Show the configuration dialog with the Subversion page selected</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="204"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> <source>Show repository info</source> <translation>Kaynak havuzu bilgisini göster</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="208"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> <source>Show some repository related information for the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnPropDelDialog</name> @@ -50459,17 +50479,17 @@ <context> <name>VersionControl</name> <message> - <location filename="VCS/VersionControl.py" line="536"/> + <location filename="VCS/VersionControl.py" line="547"/> <source>Process Generation Error</source> <translation>İşlem Üretecinde Hata</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="536"/> + <location filename="VCS/VersionControl.py" line="547"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Süreç {0} başlatılamadı. Bunun arama yolunda olduğundan emin olun.</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="662"/> + <location filename="VCS/VersionControl.py" line="673"/> <source>Repository status checking is switched off</source> <translation>Kaynak havuzu durum konrol anahtarı kapalı</translation> </message> @@ -54195,24 +54215,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1236"/> <source><tr><td><b>Parent #{0}</b></td><td></td></tr> <tr><td><b>Changeset</b></td><td>{1}</td></tr></source> <translation><tr><td><b>Esas #{0}</b></td><td></td></tr> <tr><td><b>Değişiklik seti</b></td><td>{1}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1733"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Etiketler</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1741"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Branşlar</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1252"/> <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> @@ -54221,7 +54241,7 @@ <tr><td><b>Teslim zamnanı</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -54238,23 +54258,23 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> <source><tr><td><b>Tip</b></td><td></td></tr> </source> <translation><tr><td><b>İp ucu</b></td><td></td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> <translation><tr><td><b>DEğişiklik seti</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1745"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Esas</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1734"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/> <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> @@ -54265,7 +54285,7 @@ </table></p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -54509,17 +54529,17 @@ <context> <name>subversion</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1458"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1473"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation><h3>Kaynak Havuzu Bilgisi</h3><table><tr><td><b>Altsürüm V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Geçerli Gözden Geçirme</b></td><td>{2}</td></tr><tr><td><b>Teslim edilen gözden geçirme</b></td><td>{3}</td></tr><tr><td><b>Teslim Tarihi</b></td><td>{4}</td></tr><tr><td><b>Teslim Zamanı</b></td><td>{5}</td></tr><tr><td><b>Son yazar</b></td><td>{6}</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1589"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1604"/> <source>unknown</source> <translation>bilinmeyen</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1590"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation><h3>KAynak Havuzu Bilgisi</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Altsürümn V.</b></td><td>{1}</td></tr><tr><td><b>Altsürüm API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Geçerli Gözden Geçirme</b></td><td>{4}</td></tr><tr><td><b>Teslim edilen gözden geçirme</b></td><td>{5}</td></tr><tr><td><b>Teslim tarihi</b></td><td>{6}</td></tr><tr><td><b>Teslim zamanı</b></td><td>{7}</td></tr><tr><td><b>Son yazar</b></td><td>{8}</td></tr></table></translation> </message>
--- a/i18n/eric5_zh_CN.GB2312.ts Mon May 28 15:59:36 2012 +0200 +++ b/i18n/eric5_zh_CN.GB2312.ts Tue May 29 20:59:40 2012 +0200 @@ -17996,87 +17996,87 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="251"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="252"/> - <source>The hg process did not finish within 30s.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="254"/> + <source>The hg process did not finish within 30s.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="256"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="282"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="310"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="323"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="325"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="369"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="371"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="533"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="583"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="585"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="647"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="649"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="711"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="713"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="840"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="842"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="873"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="875"/> <source>Reverting changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="923"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="925"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1176"/> <source>Mercurial command</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1352"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1366"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> @@ -18086,192 +18086,192 @@ <translation type="obsolete">选择要显示的条目数。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1597"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1611"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1650"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1664"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> <source>Create Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1804"/> <source>Enter branch name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1815"/> <source>Creating branch in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1882"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/> <source>Verifying the integrity of the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1907"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1921"/> <source>Showing the combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1930"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1944"/> <source>Showing aliases for remote repositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1953"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1967"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2210"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1825"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1839"/> <source>Showing current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2119"/> <source>Create changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2222"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2239"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2254"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2171"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1976"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1990"/> <source>Identifying project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source>Create .hgignore file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2007"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2026"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2286"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2305"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2058"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2077"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2185"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2204"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> <source>Identifying changegroup file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/> <source>Backing out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> <source>No revision given. Aborting...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2094"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2367"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2381"/> <source>Are you sure you want to rollback the last transaction?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="479"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="481"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2643"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2764"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2453"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2481"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2500"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2527"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2601"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -20860,7 +20860,7 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> <source>Resolve conflict</source> - <translation type="unfinished">解析冲突</translation> + <translation type="obsolete">解析冲突</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> @@ -20897,6 +20897,11 @@ <source>Do you really want to remove these files from the repository?</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> + <source>Conflict resolved</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> @@ -21043,60 +21048,50 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Add to repository</source> - <translation type="unfinished">添加到储存库</translation> + <translation type="obsolete">添加到储存库</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>&Add to repository...</source> - <translation type="unfinished">添加到储存库（&A）……</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="225"/> - <source>Add the local project to the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228"/> - <source><b>Add to repository</b><p>This adds (imports) the local project to the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <translation type="obsolete">添加到储存库（&A）……</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Remove from repository (and disk)</source> <translation type="unfinished">从储存库（和磁盘）中移除</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>&Remove from repository (and disk)</source> <translation type="unfinished">从储存库（和磁盘）中移除(&R)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="239"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> <source>Remove the local project from the repository (and disk)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> <source><b>Remove from repository</b><p>This removes the local project from the repository (and disk).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Show log</source> <translation type="unfinished">显示日志</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> <source>Show &log</source> <translation type="unfinished">显示日志(&l)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="254"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241"/> <source>Show the log of the local project</source> <translation type="unfinished">显示本地项目的日志</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="257"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="244"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation type="unfinished"><b>显示日志</b><p>显示本地项目的日志。</p></translation> </message> @@ -21116,652 +21111,652 @@ <translation type="obsolete"><b>显示受限日志</b><p>显示本地项目限制到条目的一个可选号上的日志。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="264"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> <source>Show log browser</source> <translation type="unfinished">显示日志浏览器</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="255"/> <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished">显示对话框以浏览本地项目的日志</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation type="unfinished"><b>显示日志浏览器</b><p>显示对话框以浏览本地项目的日志。先显示条目的受限号。稍后可以检索更多信息。</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> + <source>Show difference</source> + <translation type="unfinished">显示差异</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="267"/> + <source>Show &difference</source> + <translation type="unfinished">显示差异(&d)</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> - <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> - <translation type="unfinished"><b>显示日志浏览器</b><p>显示对话框以浏览本地项目的日志。先显示条目的受限号。稍后可以检索更多信息。</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> - <source>Show difference</source> - <translation type="unfinished">显示差异</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> - <source>Show &difference</source> - <translation type="unfinished">显示差异(&d)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished">显示本地项目与储存库的差异</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="287"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation type="unfinished"><b>显示差异</b><p>显示本地项目与储存库的差异。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> <source>Show difference (extended)</source> <translation type="unfinished">显示差异（扩展）</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished">显示项目的修订本与储存库的差异</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation type="unfinished"><b>显示差异（扩展）</b><p>显示项目的修订本与储存库的差异。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show status</source> <translation type="unfinished">显示状态</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> <source>Show &status</source> <translation type="unfinished">显示状态(&s)</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> + <source>Show the status of the local project</source> + <translation type="unfinished">显示本地项目的状态</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="302"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation type="unfinished"><b>显示状态</b><p>显示本地项目的状态。</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> + <source>Show heads</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> - <source>Show the status of the local project</source> - <translation type="unfinished">显示本地项目的状态</translation> + <source>Show the heads of the repository</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="315"/> - <source><b>Show status</b><p>This shows the status of the local project.</p></source> - <translation type="unfinished"><b>显示状态</b><p>显示本地项目的状态。</p></translation> + <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="322"/> - <source>Show heads</source> + <source>Show parents</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="325"/> - <source>Show the heads of the repository</source> + <source>Show the parents of the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="328"/> - <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> + <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> - <source>Show parents</source> + <source>Show tip</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="338"/> - <source>Show the parents of the repository</source> + <source>Show the tip of the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="341"/> - <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> + <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> - <source>Show tip</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="351"/> - <source>Show the tip of the repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="354"/> - <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Revert changes</source> <translation type="unfinished">还原改变</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="348"/> <source>Re&vert changes</source> <translation type="unfinished">还原改变(&v)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="352"/> <source>Revert all changes made to the local project</source> <translation type="unfinished">还原所有改变到本地项目中</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation type="unfinished"><b>还原改变</b><p>还原所有改变到本地项目中。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Merge</source> <translation type="unfinished">合并</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="362"/> <source>Mer&ge changes...</source> <translation type="unfinished">合并更改(&g)……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="366"/> <source>Merge changes of a revision into the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve conflicts</source> - <translation type="unfinished">解析冲突</translation> + <translation type="obsolete">解析冲突</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Resolve con&flicts</source> - <translation type="unfinished">解析冲突(&f)</translation> + <translation type="obsolete">解析冲突(&f)</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="392"/> <source>Resolve all conflicts of the local project</source> - <translation type="unfinished">解析本地项目的所有冲突</translation> + <translation type="obsolete">解析本地项目的所有冲突</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="395"/> <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> - <translation type="unfinished"><b>解析冲突</b><p>解析本地项目的所有冲突。</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> + <translation type="obsolete"><b>解析冲突</b><p>解析本地项目的所有冲突。</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>Tag in repository</source> <translation type="unfinished">在储存库中标记</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="389"/> <source>&Tag in repository...</source> <translation type="unfinished">在储存库中标记(&T)……</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> + <source>Tag the local project in the repository</source> + <translation type="unfinished">在储存库中标记本地项目</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="396"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation type="unfinished"><b>在储存库中标记</b><p>在储存库中标记本地项目。</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <source>List tags</source> + <translation type="unfinished">列出标签</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="403"/> + <source>List tags...</source> + <translation type="unfinished">列出标签……</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="406"/> - <source>Tag the local project in the repository</source> - <translation type="unfinished">在储存库中标记本地项目</translation> + <source>List tags of the project</source> + <translation type="unfinished">列出项目的标签</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="409"/> - <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> - <translation type="unfinished"><b>在储存库中标记</b><p>在储存库中标记本地项目。</p></translation> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation type="unfinished"><b>列出标签</b><p>列出项目的标签。</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>List tags</source> - <translation type="unfinished">列出标签</translation> + <source>List branches</source> + <translation type="unfinished">列出分支</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> - <source>List tags...</source> - <translation type="unfinished">列出标签……</translation> + <source>List branches...</source> + <translation type="unfinished">列出分支……</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="419"/> - <source>List tags of the project</source> - <translation type="unfinished">列出项目的标签</translation> + <source>List branches of the project</source> + <translation type="unfinished">列出项目的分支</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="422"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation type="unfinished"><b>列出标签</b><p>列出项目的标签。</p></translation> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation type="unfinished"><b>列出分支</b><p>列出项目的分支。</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source>List branches</source> - <translation type="unfinished">列出分支</translation> + <source>Create branch</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> - <source>List branches...</source> - <translation type="unfinished">列出分支……</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/> - <source>List branches of the project</source> - <translation type="unfinished">列出项目的分支</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation type="unfinished"><b>列出分支</b><p>列出项目的分支。</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> - <source>Create branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> <source>Create &branch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> <source>Create a new branch for the local project in the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="449"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> <source>Close branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> <source>Close the current branch of the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source>Switch</source> <translation type="unfinished">转换</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> <source>S&witch...</source> <translation type="unfinished">转换(&w)……</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> + <source>Switch the working directory to another revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="491"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <source>Cleanup</source> + <translation type="unfinished">清除</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <source>Cleanu&p</source> + <translation type="unfinished">清除(&p)</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="501"/> - <source>Switch the working directory to another revision</source> - <translation type="unfinished"></translation> + <source>Cleanup the local project</source> + <translation type="unfinished">清除本地项目</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> - <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> - <translation type="unfinished"></translation> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation type="unfinished"><b>清除</b><p>执行对本地项目的清除。</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> - <source>Cleanup</source> - <translation type="unfinished">清除</translation> + <source>Execute command</source> + <translation type="unfinished">执行命令</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="511"/> - <source>Cleanu&p</source> - <translation type="unfinished">清除(&p)</translation> + <source>E&xecute command...</source> + <translation type="unfinished">执行命令(&x)……</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> - <source>Cleanup the local project</source> - <translation type="unfinished">清除本地项目</translation> + <source>Execute an arbitrary Mercurial command</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="517"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation type="unfinished"><b>清除</b><p>执行对本地项目的清除。</p></translation> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> - <source>Execute command</source> - <translation type="unfinished">执行命令</translation> + <source>Command options</source> + <translation type="unfinished">命令选项</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> - <source>E&xecute command...</source> - <translation type="unfinished">执行命令(&x)……</translation> + <source>Command &options...</source> + <translation type="unfinished">命令选项(&o)……</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> - <source>Execute an arbitrary Mercurial command</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="530"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> - <source>Command options</source> - <translation type="unfinished">命令选项</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="537"/> - <source>Command &options...</source> - <translation type="unfinished">命令选项(&o)……</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="540"/> <source>Show the Mercurial command options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Configure</source> + <translation type="unfinished">配置</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="535"/> + <source>Configure...</source> + <translation type="unfinished">配置……</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="538"/> + <source>Show the configuration dialog with the Mercurial page selected</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="541"/> - <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> - <source>Configure</source> - <translation type="unfinished">配置</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> - <source>Configure...</source> - <translation type="unfinished">配置……</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> - <source>Show the configuration dialog with the Mercurial page selected</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <source>Show paths</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="589"/> + <source>Show paths...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="592"/> + <source>Show the aliases for remote repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="595"/> + <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> - <source>Show paths</source> + <source>Verify repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> - <source>Show paths...</source> + <source>Verify repository...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="605"/> - <source>Show the aliases for remote repositories</source> + <source>Verify the integrity of the repository</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> - <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> + <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Verify repository</source> + <source>Recover</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> - <source>Verify repository...</source> + <source>Recover...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="618"/> - <source>Verify the integrity of the repository</source> + <source>Recover from an interrupted transaction</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="621"/> - <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> - <source>Recover</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> - <source>Recover...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> - <source>Recover from an interrupted transaction</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="893"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <source>Create .hgignore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <source>Create a .hgignore file with default values</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> - <source>Create .hgignore</source> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <source>Create changegroup...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> - <source>Create a .hgignore file with default values</source> + <source>Create changegroup file collecting changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1256"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> + <source>Apply changegroups...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> + <source>Apply one or several changegroup files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="923"/> + <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> - <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Create changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> - <source>Create changegroup...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="670"/> - <source>Create changegroup file collecting changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1270"/> - <source>Apply changegroups</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> - <source>Apply changegroups...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="712"/> - <source>Apply one or several changegroup files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> - <source>Changegroup Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="673"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> <source>Show current branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="487"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> <source>Show the current branch of the project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="477"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Mark as "good"</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> + <source>Mark a selectable changeset as good</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/> + <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> - <source>Mark as "good"</source> + <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="726"/> - <source>Mark a selectable changeset as good</source> + <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="729"/> - <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Mark as "bad"</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> - <source>Mark a selectable changeset as bad</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> - <source>Skip</source> - <translation type="unfinished">跳过</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> - <source>Reset</source> - <translation type="unfinished">重置</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> - <source>Reset the bisect search data</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> - <source><b>Reset</b><p>This resets the bisect search data.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="950"/> - <source>Bisect</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> - <source>Mark as "good"...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> + <source>Skip</source> + <translation type="unfinished">跳过</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <source>Reset</source> + <translation type="unfinished">重置</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <source>Reset the bisect search data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <source><b>Reset</b><p>This resets the bisect search data.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="937"/> + <source>Bisect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <source>Mark as "good"...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="723"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Preview changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Identify</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="628"/> <source>Identify...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> <source>Identify the project directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="634"/> <source><b>Identify</b><p>This identifies the project directory.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="671"/> <source>Preview a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Identify changegroup</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> <source>Identify changegroup...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> <source>Identify a changegroup file containing a collection of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="701"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> <source>Back out changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="765"/> <source>Back out changes of an earlier changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation type="unfinished"></translation> </message> @@ -21781,260 +21776,280 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> <source>Specials</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Serve project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Serve project repository...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/> <source>Serve the project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="806"/> <source><b>Serve project repository</b><p>This serves the project repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1108"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1094"/> <source>Pull</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="457"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> <source>Push new branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> <source>Push the current branch of the local project as a new named branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="463"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="788"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="778"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="794"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care.</strong></p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="958"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source>Edit user configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <source>Edit user configuration...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> + <source>Show an editor to edit the user configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> + <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit user configuration</source> + <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="561"/> - <source>Edit user configuration...</source> + <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> - <source>Show an editor to edit the user configuration file</source> + <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="567"/> - <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Edit repository configuration</source> + <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> - <source>Edit repository configuration...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> - <source>Show an editor to edit the repository configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="580"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> - <source>Show combined configuration settings</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> <source>Show combined configuration settings...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="578"/> <source>Show the combined configuration settings from all configuration files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="749"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="752"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="755"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="742"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1325"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1311"/> <source>Import Patch</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="813"/> + <source>Import Patch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="816"/> + <source>Import a patch from a patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="931"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1330"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> - <source>Import Patch...</source> + <source>Export Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="829"/> - <source>Import a patch from a patch file</source> + <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="832"/> - <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="944"/> - <source>Patch Management</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1344"/> - <source>Revert Changes</source> + <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> - <source>Export Patches</source> + <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/> - <source>Export Patches...</source> + <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/> - <source>Export revisions to patch files</source> + <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/> - <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="852"/> - <source>Change Phase...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> - <source>Change the phase of revisions</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1349"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="856"/> + <source>Copies changesets from another branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="859"/> + <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="868"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="875"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="956"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1363"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> - <source>Copies changesets from another branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> - <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/> - <source>Continue the last copying session after conflicts were resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="969"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1377"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="376"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="382"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -32194,7 +32209,7 @@ <translation><b>代码覆盖率……</b><p>显示项目中所有 Python 文件的代码覆盖率。</p></translation> </message> <message> - <location filename="Project/Project.py" line="3901"/> + <location filename="Project/Project.py" line="3903"/> <source>Profile Data</source> <translation>剖析数据</translation> </message> @@ -32254,7 +32269,7 @@ <translation type="obsolete"><b>移除循环报告</b><p>移除项目的循环报告。</p></translation> </message> <message> - <location filename="Project/Project.py" line="3954"/> + <location filename="Project/Project.py" line="3956"/> <source>Application Diagram</source> <translation>应用程序图</translation> </message> @@ -32274,7 +32289,7 @@ <translation><b>应用程序图……</b><p>显示项目的图表。</p></translation> </message> <message> - <location filename="Project/Project.py" line="4085"/> + <location filename="Project/Project.py" line="4087"/> <source>Create Package List</source> <translation>创建程序包列表</translation> </message> @@ -32294,7 +32309,7 @@ <translation type="obsolete"><b>创建程序包列表</b><p>创建一个初始化文件列表并包含到 Eric4 插件存档中。该列表从项目文件创建。</p></translation> </message> <message> - <location filename="Project/Project.py" line="4245"/> + <location filename="Project/Project.py" line="4247"/> <source>Create Plugin Archive</source> <translation>创建插件存档</translation> </message> @@ -32419,27 +32434,27 @@ <translation type="obsolete"><p>所选版本控制系统 <b>%1</b> 未找到。<br/>禁用版本控制。</p><p>%2</p></translation> </message> <message> - <location filename="Project/Project.py" line="3834"/> + <location filename="Project/Project.py" line="3836"/> <source>Coverage Data</source> <translation>覆盖率数据</translation> </message> <message> - <location filename="Project/Project.py" line="3880"/> + <location filename="Project/Project.py" line="3882"/> <source>There is no main script defined for the current project. Aborting</source> <translation>当前项目未定义主脚本。终止</translation> </message> <message> - <location filename="Project/Project.py" line="3855"/> + <location filename="Project/Project.py" line="3857"/> <source>Code Coverage</source> <translation>代码覆盖率</translation> </message> <message> - <location filename="Project/Project.py" line="3855"/> + <location filename="Project/Project.py" line="3857"/> <source>Please select a coverage file</source> <translation>请选择一个覆盖率文件</translation> </message> <message> - <location filename="Project/Project.py" line="3901"/> + <location filename="Project/Project.py" line="3903"/> <source>Please select a profile file</source> <translation>请选择一个剖析文件</translation> </message> @@ -32454,12 +32469,12 @@ <translation type="obsolete">请选择要移除的循环报告</translation> </message> <message> - <location filename="Project/Project.py" line="3954"/> + <location filename="Project/Project.py" line="3956"/> <source>Include module names?</source> <translation>包含模块名？</translation> </message> <message> - <location filename="Project/Project.py" line="4058"/> + <location filename="Project/Project.py" line="4060"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation><p>文件 <b>PKGLIST</b> 已存在。</p><p>是否覆盖？</p></translation> </message> @@ -32469,12 +32484,12 @@ <translation type="obsolete"><p>文件 <b>PKGLIST</b> 无法创建。</p><p>原因： %1</p></translation> </message> <message> - <location filename="Project/Project.py" line="4102"/> + <location filename="Project/Project.py" line="4104"/> <source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source> <translation><p>文件 <b>PKGLIST</b> 不存在。终止……</p></translation> </message> <message> - <location filename="Project/Project.py" line="4110"/> + <location filename="Project/Project.py" line="4112"/> <source>The project does not have a main script defined. Aborting...</source> <translation>项目未定义主脚本。终止……</translation> </message> @@ -32689,32 +32704,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4085"/> + <location filename="Project/Project.py" line="4087"/> <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4122"/> + <location filename="Project/Project.py" line="4124"/> <source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4133"/> + <location filename="Project/Project.py" line="4135"/> <source><p>The eric5 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4153"/> + <location filename="Project/Project.py" line="4155"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4165"/> + <location filename="Project/Project.py" line="4167"/> <source><p>The eric5 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Project/Project.py" line="4245"/> + <location filename="Project/Project.py" line="4247"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -42059,87 +42074,87 @@ <translation type="obsolete">svn 进程已由退出代码 %1 结束</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="195"/> <source>The svn process did not finish within 30s.</source> <translation>svn 进程在 30 秒内不结束。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="196"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="197"/> <source>Could not start the svn executable.</source> <translation>无法开始 svn 执行。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="221"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> <source>Create project in repository</source> <translation>在储存库中创建项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="221"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="222"/> <source>The project could not be created in the repository. Maybe the given repository doesn't exist or the repository server is down.</source> <translation>无法在储存库中创建项目。已给储存库可能不存在或储存库服务已关闭。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> <source>New project</source> <translation>新建项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="244"/> <source>The project could not be checked out of the repository.<br />Restoring the original contents.</source> <translation>无法从储存库中校验项目。<br />恢复原始内容。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="313"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="314"/> <source>Importing project into Subversion repository</source> <translation>将项目导入到版本控制储存库中</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="363"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="364"/> <source>Subversion Checkout</source> <translation>版本控制校验</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> <source>The tag must be a normal tag (tags) or a branch tag (branches). Please select from the list.</source> <translation>标签必须是标准标签或分支标签。请从列表中选择。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="385"/> <source>Checking project out of Subversion repository</source> <translation>正在从版本控制储存库中检查项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="425"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="426"/> <source>Subversion Export</source> <translation>版本控制导出</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="445"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="446"/> <source>Exporting project from Subversion repository</source> <translation>正在从版本控制储存库中导出项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="529"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="530"/> <source>Commiting changes to Subversion repository</source> <translation>正在将改变提交到版本控制储存库中</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="585"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="586"/> <source>Synchronizing with the Subversion repository</source> <translation>正在与版本控制储存库同步</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="686"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="687"/> <source>Adding files/directories to the Subversion repository</source> <translation>将文件或文件夹添加到版本控制储存库</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="785"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="786"/> <source>Adding directory trees to the Subversion repository</source> <translation>将目录树添加到版本控制储存库</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="820"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="821"/> <source>Removing files/directories from the Subversion repository</source> <translation>从版本控制储存库移除文件或文件夹</translation> </message> @@ -42149,17 +42164,17 @@ <translation type="obsolete">正在移动 %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> <source>Subversion Error</source> <translation>版本控制错误</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="986"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="987"/> <source>The URL of the project repository could not be retrieved from the working copy. The tag operation will be aborted</source> <translation>项目储存库的 URL 无法从工作拷贝中检索。标签操作将被终止</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1010"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1011"/> <source>The URL of the project repository has an invalid format. The tag operation will be aborted</source> <translation>项目储存库的 URL 包含无效格式。标签操作将被终止</translation> </message> @@ -42169,17 +42184,17 @@ <translation type="obsolete">在版本控制储存库中标记 %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1074"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1075"/> <source>Reverting changes</source> <translation>还原改变</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1101"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1102"/> <source>The URL of the project repository could not be retrieved from the working copy. The switch operation will be aborted</source> <translation>项目储存库的 URL 无法从工作拷贝中检索。转换操作将被终止</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1125"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1126"/> <source>The URL of the project repository has an invalid format. The switch operation will be aborted</source> <translation>项目储存库的 URL 包含无效格式。转换操作将被终止</translation> </message> @@ -42199,12 +42214,12 @@ <translation type="obsolete">清除 %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1548"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1563"/> <source>Subversion command</source> <translation>版本控制命令</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1655"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1670"/> <source>Resolving conficts</source> <translation>解析冲突</translation> </message> @@ -42214,72 +42229,72 @@ <translation type="obsolete">复制 %1</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1761"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1776"/> <source>Subversion Set Property</source> <translation>版本控制设置属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1794"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1809"/> <source>You have to supply a property name. Aborting.</source> <translation>必须提供一个属性名。终止。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1812"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> <source>Subversion Delete Property</source> <translation>版本控制删除属性</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1632"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1647"/> <source>Enter property name</source> <translation>输入属性名</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="922"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> <source>Subversion Log</source> <translation>版本控制日志</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="922"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="923"/> <source>Select number of entries to show.</source> <translation>选择要显示的条目数。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1978"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1993"/> <source>Locking in the Subversion repository</source> <translation>在版本控制储存库中锁定</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2016"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2031"/> <source>Unlocking in the Subversion repository</source> <translation>在版本控制储存库中解锁</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2061"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2076"/> <source>Relocating</source> <translation>重新定位</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> <source>Repository Browser</source> <translation>储存库浏览器</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2087"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2102"/> <source>Enter the repository URL.</source> <translation>输入储存库 URL。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2111"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2126"/> <source>Remove from changelist</source> <translation>从更改列表中移除</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2162"/> <source>Add to changelist</source> <translation>添加更改列表</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2137"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2152"/> <source>Enter name of the changelist:</source> <translation>输入更改列表名称：</translation> </message> @@ -42303,22 +42318,22 @@ </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1777"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1792"/> <source>Property set.</source> <translation>属性设置。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1827"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1842"/> <source>Property deleted.</source> <translation>属性已删除。</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1958"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> <source>Subversion Lock</source> <translation>版本控制锁定</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1958"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1973"/> <source>Enter lock comment</source> <translation>输入锁定注释</translation> </message> @@ -42488,53 +42503,53 @@ <translation>unversioned</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="191"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="192"/> <source>The svn process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="882"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="883"/> <source>Moving {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1045"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1046"/> <source>Tagging {0} in the Subversion repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1147"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1148"/> <source>Switching to {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1249"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1250"/> <source>Merging {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1512"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1527"/> <source>Cleaning up {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1694"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1709"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="329"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="330"/> <source>Imported revision {0}. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="554"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="555"/> <source>Committed revision {0}.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1154"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1155"/> <source>Revision {0}. </source> <translation type="unfinished"></translation> @@ -44297,7 +44312,7 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> <source>Resolve conflict</source> - <translation>解析冲突</translation> + <translation type="obsolete">解析冲突</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="388"/> @@ -44364,6 +44379,11 @@ <source>Show repository info</source> <translation>显示储存库信息</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="633"/> + <source>Conflict resolved</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnProjectHelper</name> @@ -44430,60 +44450,60 @@ <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>Add to repository</source> - <translation>添加到储存库</translation> + <translation type="obsolete">添加到储存库</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>&Add to repository...</source> - <translation>添加到储存库（&A）……</translation> + <translation type="obsolete">添加到储存库（&A）……</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="92"/> <source>Add the local project to the VCS repository</source> - <translation>将本地项目添加到版本控制系统储存库中</translation> + <translation type="obsolete">将本地项目添加到版本控制系统储存库中</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="95"/> <source><b>Add to repository</b><p>This adds (imports) the local project to the VCS repository.</p></source> - <translation><b>添加到储存库</b><p>将本地项目添加（导入）到版本控制系统储存库中。</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="102"/> + <translation type="obsolete"><b>添加到储存库</b><p>将本地项目添加（导入）到版本控制系统储存库中。</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>Remove from repository (and disk)</source> <translation>从储存库（和磁盘）中移除</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="102"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="89"/> <source>&Remove from repository (and disk)</source> <translation>从储存库（和磁盘）中移除(&R)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="93"/> <source>Remove the local project from the VCS repository (and disk)</source> <translation>从版本控制系统储存库（和磁盘）中移除本地项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="109"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="96"/> <source><b>Remove from repository</b><p>This removes the local project from the VCS repository (and disk).</p></source> <translation><b>从储存库移除</b><p>从版本控制系统储存库（和磁盘）中移除本地项目</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> <source>Show log</source> <translation>显示日志</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="117"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="104"/> <source>Show &log</source> <translation>显示日志(&l)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="121"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="108"/> <source>Show the log of the local project</source> <translation>显示本地项目的日志</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="124"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="111"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>显示日志</b><p>显示本地项目的日志。</p></translation> </message> @@ -44503,465 +44523,485 @@ <translation type="obsolete"><b>显示受限日志</b><p>显示本地项目限制到条目的一个可选号上的日志。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="131"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="118"/> <source>Show log browser</source> <translation>显示日志浏览器</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="122"/> <source>Show a dialog to browse the log of the local project</source> <translation>显示对话框以浏览本地项目的日志</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="125"/> + <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> + <translation><b>显示日志浏览器</b><p>显示对话框以浏览本地项目的日志。先显示条目的受限号。稍后可以检索更多信息。</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/> + <source>Show difference</source> + <translation>显示差异</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="134"/> + <source>Show &difference</source> + <translation>显示差异(&d)</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="138"/> - <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> - <translation><b>显示日志浏览器</b><p>显示对话框以浏览本地项目的日志。先显示条目的受限号。稍后可以检索更多信息。</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> - <source>Show difference</source> - <translation>显示差异</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="147"/> - <source>Show &difference</source> - <translation>显示差异(&d)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="151"/> <source>Show the difference of the local project to the repository</source> <translation>显示本地项目与储存库的差异</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="141"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation><b>显示差异</b><p>显示本地项目与储存库的差异。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="161"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="148"/> <source>Show difference (extended)</source> <translation>显示差异（扩展）</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> <source>Show the difference of revisions of the project to the repository</source> <translation>显示项目的修订本与储存库的差异</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="155"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation><b>显示差异（扩展）</b><p>显示项目的修订本与储存库的差异。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="175"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="162"/> <source>Show difference (URLs)</source> <translation>显示差异（URL）</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="179"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="166"/> <source>Show the difference of the project between two repository URLs</source> <translation>显示两个储存库 URL 中项目的差异</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="169"/> <source><b>Show difference (URLs)</b><p>This shows the difference of the project between two repository URLs.</p></source> <translation><b>显示差异（URL）</b><p>显示两个储存库 URL 中项目的差异。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="177"/> <source>Show status</source> <translation>显示状态</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="177"/> <source>Show &status</source> <translation>显示状态(&s)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="181"/> <source>Show the status of the local project</source> <translation>显示本地项目的状态</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="197"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="184"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>显示状态</b><p>显示本地项目的状态。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>Tag in repository</source> <translation>在储存库中标记</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="219"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="206"/> <source>&Tag in repository...</source> <translation>在储存库中标记(&T)……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="223"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="210"/> <source>Tag the local project in the repository</source> <translation>在储存库中标记本地项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="226"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="213"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>在储存库中标记</b><p>在储存库中标记本地项目。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> <source>Export from repository</source> <translation>从储存库导出</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="220"/> <source>&Export from repository...</source> <translation>从储存库导出(&E)……</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="224"/> + <source>Export a project from the repository</source> + <translation>从储存库中导出一个项目</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="227"/> + <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> + <translation><b>从储存库导出</b><p>从储存库导出一个项目。</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <source>Command options</source> + <translation>命令选项</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="234"/> + <source>Command &options...</source> + <translation>命令选项(&o)……</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="237"/> - <source>Export a project from the repository</source> - <translation>从储存库中导出一个项目</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="240"/> - <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> - <translation><b>从储存库导出</b><p>从储存库导出一个项目。</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> - <source>Command options</source> - <translation>命令选项</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="247"/> - <source>Command &options...</source> - <translation>命令选项(&o)……</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="250"/> <source>Show the VCS command options</source> <translation>显示版本控制系统命令选项</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="251"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="238"/> <source><b>Command options...</b><p>This shows a dialog to edit the VCS command options.</p></source> <translation><b>命令选项……</b><p>显示一个对话框以编辑版本控制系统命令选项。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Revert changes</source> <translation>还原改变</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="245"/> <source>Re&vert changes</source> <translation>还原改变(&v)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="262"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="249"/> <source>Revert all changes made to the local project</source> <translation>还原所有改变到本地项目中</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="265"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="252"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>还原改变</b><p>还原所有改变到本地项目中。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> <source>Merge</source> <translation>合并</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="259"/> <source>Mer&ge changes...</source> <translation>合并更改(&g)……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="276"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="263"/> <source>Merge changes of a tag/revision into the local project</source> <translation>将标签或修订本的改变合并到当前项目</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="279"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="266"/> <source><b>Merge</b><p>This merges changes of a tag/revision into the local project.</p></source> <translation><b>合并</b><p>将标签或修订本的改变合并到当前项目。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> <source>Switch</source> <translation>转换</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="286"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="273"/> <source>S&witch...</source> <translation>转换(&w)……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="277"/> <source>Switch the local copy to another tag/branch</source> <translation>转换本地副本到另一个标签或分支</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="280"/> <source><b>Switch</b><p>This switches the local copy to another tag/branch.</p></source> <translation><b>转换</b><p>转换本地副本到另一个标签或分支。</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Resolve conflicts</source> - <translation>解析冲突</translation> + <translation type="obsolete">解析冲突</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Resolve con&flicts</source> - <translation>解析冲突(&f)</translation> + <translation type="obsolete">解析冲突(&f)</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> <source>Resolve all conflicts of the local project</source> - <translation>解析本地项目的所有冲突</translation> + <translation type="obsolete">解析本地项目的所有冲突</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> - <translation><b>解析冲突</b><p>解析本地项目的所有冲突。</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <translation type="obsolete"><b>解析冲突</b><p>解析本地项目的所有冲突。</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> <source>Cleanup</source> <translation>清除</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="300"/> + <source>Cleanu&p</source> + <translation>清除(&p)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="303"/> + <source>Cleanup the local project</source> + <translation>清除本地项目</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="306"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation><b>清除</b><p>执行对本地项目的清除。</p></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> - <source>Cleanu&p</source> - <translation>清除(&p)</translation> + <source>Execute command</source> + <translation>执行命令</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="313"/> + <source>E&xecute command...</source> + <translation>执行命令(&x)……</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="316"/> - <source>Cleanup the local project</source> - <translation>清除本地项目</translation> + <source>Execute an arbitrary VCS command</source> + <translation>执行任意的版本控制系统命令</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="319"/> - <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> - <translation><b>清除</b><p>执行对本地项目的清除。</p></translation> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> + <translation><b>执行命令</b><p>打开一个对话框以输入任意一个版本控制系统命令。</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> - <source>Execute command</source> - <translation>执行命令</translation> + <source>List tags</source> + <translation>列出标签</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="326"/> - <source>E&xecute command...</source> - <translation>执行命令(&x)……</translation> + <source>List tags...</source> + <translation>列出标签……</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="329"/> - <source>Execute an arbitrary VCS command</source> - <translation>执行任意的版本控制系统命令</translation> + <source>List tags of the project</source> + <translation>列出项目的标签</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="332"/> - <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary VCS command.</p></source> - <translation><b>执行命令</b><p>打开一个对话框以输入任意一个版本控制系统命令。</p></translation> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation><b>列出标签</b><p>列出项目的标签。</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> - <source>List tags</source> - <translation>列出标签</translation> + <source>List branches</source> + <translation>列出分支</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="339"/> - <source>List tags...</source> - <translation>列出标签……</translation> + <source>List branches...</source> + <translation>列出分支……</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="342"/> - <source>List tags of the project</source> - <translation>列出项目的标签</translation> + <source>List branches of the project</source> + <translation>列出项目的分支</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="345"/> - <source><b>List tags</b><p>This lists the tags of the project.</p></source> - <translation><b>列出标签</b><p>列出项目的标签。</p></translation> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation><b>列出分支</b><p>列出项目的分支。</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> - <source>List branches</source> - <translation>列出分支</translation> + <source>List repository contents</source> + <translation>列出储存库内容</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="352"/> - <source>List branches...</source> - <translation>列出分支……</translation> + <source>List repository contents...</source> + <translation>列出储存库内容……</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="355"/> - <source>List branches of the project</source> - <translation>列出项目的分支</translation> + <source>Lists the contents of the repository</source> + <translation>列出储存库的内容</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="358"/> - <source><b>List branches</b><p>This lists the branches of the project.</p></source> - <translation><b>列出分支</b><p>列出项目的分支。</p></translation> + <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> + <translation><b>列出储存库内容</b><p>列出储存库的内容。</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> - <source>List repository contents</source> - <translation>列出储存库内容</translation> + <source>Set Property</source> + <translation>设置属性</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="365"/> - <source>List repository contents...</source> - <translation>列出储存库内容……</translation> + <source>Set Property...</source> + <translation>设置属性……</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="368"/> - <source>Lists the contents of the repository</source> - <translation>列出储存库的内容</translation> + <source>Set a property for the project files</source> + <translation>为项目文件设置一个属性</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="371"/> - <source><b>List repository contents</b><p>This lists the contents of the repository.</p></source> - <translation><b>列出储存库内容</b><p>列出储存库的内容。</p></translation> + <source><b>Set Property</b><p>This sets a property for the project files.</p></source> + <translation><b>设置属性</b><p>为项目文件设置一个属性。</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> - <source>Set Property</source> - <translation>设置属性</translation> + <source>List Properties</source> + <translation>列出属性</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="378"/> - <source>Set Property...</source> - <translation>设置属性……</translation> + <source>List Properties...</source> + <translation>列出属性……</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="381"/> - <source>Set a property for the project files</source> - <translation>为项目文件设置一个属性</translation> + <source>List properties of the project files</source> + <translation>列出项目文件的属性</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="384"/> - <source><b>Set Property</b><p>This sets a property for the project files.</p></source> - <translation><b>设置属性</b><p>为项目文件设置一个属性。</p></translation> + <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> + <translation><b>列出属性</b><p>列出项目文件的属性。</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> - <source>List Properties</source> - <translation>列出属性</translation> + <source>Delete Property</source> + <translation>删除属性</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="391"/> - <source>List Properties...</source> - <translation>列出属性……</translation> + <source>Delete Property...</source> + <translation>删除属性……</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="394"/> - <source>List properties of the project files</source> - <translation>列出项目文件的属性</translation> + <source>Delete a property for the project files</source> + <translation>从项目文件中删除一个属性</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="397"/> - <source><b>List Properties</b><p>This lists the properties of the project files.</p></source> - <translation><b>列出属性</b><p>列出项目文件的属性。</p></translation> + <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> + <translation><b>删除属性</b><p>从项目文件中删除一个属性。</p></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> - <source>Delete Property</source> - <translation>删除属性</translation> + <source>Relocate</source> + <translation>重定位</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="404"/> - <source>Delete Property...</source> - <translation>删除属性……</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="407"/> - <source>Delete a property for the project files</source> - <translation>从项目文件中删除一个属性</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="410"/> - <source><b>Delete Property</b><p>This deletes a property for the project files.</p></source> - <translation><b>删除属性</b><p>从项目文件中删除一个属性。</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> - <source>Relocate</source> - <translation>重定位</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="417"/> <source>Relocate...</source> <translation>重定位……</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="421"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="408"/> <source>Relocate the working copy to a new repository URL</source> <translation>将工作副本重定位到一个新的储存库 URL</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="424"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="411"/> <source><b>Relocate</b><p>This relocates the working copy to a new repository URL.</p></source> <translation><b>重定位</b><p>将工作副本重定位到一个新的储存库 URL 。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> <source>Repository Browser</source> <translation>储存库浏览器</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="418"/> <source>Repository Browser...</source> <translation>储存库浏览器……</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="422"/> + <source>Show the Repository Browser dialog</source> + <translation>显示储存库浏览器对话框</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="425"/> + <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> + <translation><b>储存库浏览器</b><p>显示储存库浏览器对话框。</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <source>Configure</source> + <translation>配置</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="432"/> + <source>Configure...</source> + <translation>配置……</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="435"/> - <source>Show the Repository Browser dialog</source> - <translation>显示储存库浏览器对话框</translation> + <source>Show the configuration dialog with the Subversion page selected</source> + <translation>显示配置对话框并自动选择版本控制页面</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="438"/> - <source><b>Repository Browser</b><p>This shows the Repository Browser dialog.</p></source> - <translation><b>储存库浏览器</b><p>显示储存库浏览器对话框。</p></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> - <source>Configure</source> - <translation>配置</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="445"/> - <source>Configure...</source> - <translation>配置……</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="448"/> - <source>Show the configuration dialog with the Subversion page selected</source> - <translation>显示配置对话框并自动选择版本控制页面</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="451"/> <source><b>Configure</b><p>Show the configuration dialog with the Subversion page selected.</p></source> <translation><b>配置</b><p>显示配置对话框并自动选择版本控制页面。</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="204"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="191"/> <source>Show repository info</source> <translation>显示储存库信息</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="208"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="195"/> <source>Show some repository related information for the local project</source> <translation>显示本地项目的一些储存库相关信息</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="211"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="198"/> <source><b>Show repository info</b><p>This shows some repository related information for the local project.</p></source> <translation><b>显示储存库信息</b><p>显示本地项目的一些储存库相关信息。</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <source>Conflicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="287"/> + <source>Con&flicts resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="290"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="293"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnPropDelDialog</name> @@ -54493,7 +54533,7 @@ <context> <name>VersionControl</name> <message> - <location filename="VCS/VersionControl.py" line="536"/> + <location filename="VCS/VersionControl.py" line="547"/> <source>Process Generation Error</source> <translation>进程生成错误</translation> </message> @@ -54503,12 +54543,12 @@ <translation type="obsolete">无法启动进程 %1，在搜索路径中。</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="662"/> + <location filename="VCS/VersionControl.py" line="673"/> <source>Repository status checking is switched off</source> <translation>储存库状态检查被关闭</translation> </message> <message> - <location filename="VCS/VersionControl.py" line="536"/> + <location filename="VCS/VersionControl.py" line="547"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -58442,30 +58482,30 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1222"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1236"/> <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="1719"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1733"/> <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="1727"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1741"/> <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="1238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1252"/> <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="1268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1282"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -58476,23 +58516,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1727"/> <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="1715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1729"/> <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="1731"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1745"/> <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="1734"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1748"/> <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> @@ -58500,7 +58540,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1737"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> @@ -58749,7 +58789,7 @@ <translation type="obsolete"><h3>储存库信息</h3><table><tr><td><b>版本控制版本</b></td><td>%1</td></tr><tr><td><b>URL</b></td><td>%2</td></tr><tr><td><b>当前修订</b></td><td>%3</td></tr><tr><td><b>已提交的修订</b></td><td>%4</td></tr><tr><td><b>提交日期</b></td><td>%5</td></tr><tr><td><b>提交时间</b></td><td>%6</td></tr><tr><td><b>最终作者</b></td><td>%7</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1589"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1604"/> <source>unknown</source> <translation>未知</translation> </message> @@ -58759,12 +58799,12 @@ <translation type="obsolete"><h3>储存库信息</h3><table><tr><td><b>PySvn 版本</b></td><td>%1</td></tr><tr><td><b>版本控制版本</b></td><td>%2</td></tr><tr><td><b>版本控制 API 版本</b></td><td>%3</td></tr><tr><td><b>URL</b></td><td>%4</td></tr><tr><td><b>当前修订</b></td><td>%5</td></tr><tr><td><b>已提交的修订</b></td><td>%6</td></tr><tr><td><b>提交日期</b></td><td>%7</td></tr><tr><td><b>提交时间</b></td><td>%8</td></tr><tr><td><b>最终作者</b></td><td>%9</td></tr></table></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1458"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1473"/> <source><h3>Repository information</h3><table><tr><td><b>Subversion V.</b></td><td>{0}</td></tr><tr><td><b>URL</b></td><td>{1}</td></tr><tr><td><b>Current revision</b></td><td>{2}</td></tr><tr><td><b>Committed revision</b></td><td>{3}</td></tr><tr><td><b>Committed date</b></td><td>{4}</td></tr><tr><td><b>Comitted time</b></td><td>{5}</td></tr><tr><td><b>Last author</b></td><td>{6}</td></tr></table></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1590"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/subversion.py" line="1605"/> <source><h3>Repository information</h3><table><tr><td><b>PySvn V.</b></td><td>{0}</td></tr><tr><td><b>Subversion V.</b></td><td>{1}</td></tr><tr><td><b>Subversion API V.</b></td><td>{2}</td></tr><tr><td><b>URL</b></td><td>{3}</td></tr><tr><td><b>Current revision</b></td><td>{4}</td></tr><tr><td><b>Committed revision</b></td><td>{5}</td></tr><tr><td><b>Committed date</b></td><td>{6}</td></tr><tr><td><b>Comitted time</b></td><td>{7}</td></tr><tr><td><b>Last author</b></td><td>{8}</td></tr></table></source> <translation type="unfinished"></translation> </message>
