--- a/i18n/eric5_it.ts Sat May 01 18:27:07 2010 +0000 +++ b/i18n/eric5_it.ts Sun May 02 09:55:49 2010 +0000 @@ -14338,12 +14338,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> - <source><p>The Mercurial bundle file <b>{0}</b> already exists.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1819"/> <source>Shall the working directory be updated?</source> <translation type="unfinished"></translation> </message> @@ -14358,33 +14353,23 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1803"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1833"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1817"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1847"/> <source>Bisect subcommand ({0}) invalid.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1844"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1874"/> <source>Mercurial Bisect ({0})</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/> - <source>Mercurial Bundle Files (*.hg)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1752"/> - <source>Preview changegroup</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1783"/> - <source>Mercurial Bundle Files (*.hg);;All Files (*)</source> + <source>Preview changegroup</source> <translation type="unfinished"></translation> </message> <message> @@ -14403,10 +14388,30 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1876"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1906"/> <source>Removing files from the Mercurial repository only</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1698"/> + <source>Mercurial Changegroup Files (*.hg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/> + <source><p>The Mercurial changegroup file <b>{0}</b> already exists.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/> + <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1793"/> + <source>Identifying changegroup file</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -16355,7 +16360,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="715"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -16390,22 +16395,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Apply changegroups</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="641"/> <source>Apply changegroups...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="644"/> <source>Apply one or several changegroup files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="718"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="733"/> <source>Changegroup Management</source> <translation type="unfinished"></translation> </message> @@ -16415,7 +16420,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="632"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> <source><b>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> @@ -16435,77 +16440,77 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Mark as "good"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="658"/> <source>Mark a selectable changeset as good</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> <source><b>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="653"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Mark as "bad"</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="656"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="671"/> <source>Mark a selectable changeset as bad</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="659"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <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="666"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> <source>Skip</source> <translation type="unfinished">Salta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="669"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="684"/> <source>Skip the current changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="672"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="687"/> <source><b>Skip</b><p>This skips the current changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="679"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="694"/> <source>Reset</source> <translation type="unfinished">Resetta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="697"/> <source>Reset the bisect search data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="700"/> <source><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="723"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Bisect</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="640"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="655"/> <source>Mark as "good"...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> <source>Mark as "bad"...</source> <translation type="unfinished"></translation> </message> @@ -16520,16 +16525,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="614"/> - <source>Preview a changegroup file containing a collecting of changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="617"/> - <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collecting of changesets.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> <source>Identify</source> <translation type="unfinished"></translation> @@ -16549,6 +16544,36 @@ <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="614"/> + <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="617"/> + <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="626"/> + <source>Identify changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="626"/> + <source>Identify changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="629"/> + <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="632"/> + <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name>