--- a/i18n/eric5_it.ts Sat Apr 24 13:56:43 2010 +0000 +++ b/i18n/eric5_it.ts Sat Apr 24 17:32:07 2010 +0000 @@ -14188,82 +14188,82 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="157"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="158"/> <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="160"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="161"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="162"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="163"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="188"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="189"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="188"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="189"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="216"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="231"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="232"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="272"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="273"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="370"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="371"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="411"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="412"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="459"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="460"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="520"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="577"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="578"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="685"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="686"/> <source>Taging in the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="715"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="716"/> <source>Reverting changes</source> <translation type="unfinished">Annullamento modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="756"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="757"/> <source>Merging</source> <translation type="unfinished"></translation> </message> @@ -14333,10 +14333,40 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1568"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1709"/> <source>Recovering from interrupted transaction</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <source>Mercurial Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1627"/> + <source>Mercurial Bundle Files (*.bundle)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1644"/> + <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="1695"/> + <source>Mercurial Unbundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1689"/> + <source>Mercurial Bundle Files (*.bundle);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1695"/> + <source>Shall the working directory be updated?</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -14427,6 +14457,104 @@ </message> </context> <context> + <name>HgBundleDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="14"/> + <source>Mercurial Bundle</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Revisione</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="29"/> + <source>Select to specify a revision by number</source> + <translation type="unfinished">Seleziona per specificare una revisione con un numero</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="32"/> + <source>Number</source> + <translation type="unfinished">Numero</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="42"/> + <source>Enter a revision number</source> + <translation type="unfinished">Inserisci un numero di revisione</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="71"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="74"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="84"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="91"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="94"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="104"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="114"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="117"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="127"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="137"/> + <source>Select to not specify a specific revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="140"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="153"/> + <source>Select the compression type (empty for default)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="160"/> + <source>Select to bundle all changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="163"/> + <source>Bundle all changesets</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgCommandDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/> @@ -14781,12 +14909,12 @@ <translation type="unfinished">Seleziona il campo su cui filtrare</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="801"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="800"/> <source>Revision</source> <translation type="unfinished">Revisione</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="798"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="797"/> <source>Author</source> <translation type="unfinished">Autore</translation> </message> @@ -14946,27 +15074,27 @@ <translation type="unfinished">Modificato</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="463"/> <source>Process Generation Error</source> <translation type="unfinished">Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="464"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="463"/> <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="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="314"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="316"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="320"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="319"/> <source>Mercurial Error</source> <translation type="unfinished"></translation> </message> @@ -15291,7 +15419,7 @@ <translation type="unfinished">Seleziona la directory del Repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="71"/> <source>Select Project Directory</source> <translation type="unfinished">Seleziona la directory del progetto</translation> </message> @@ -15343,97 +15471,97 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="470"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="450"/> <source>Version Control</source> <translation type="unfinished">Controllo di Versione</translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="461"/> + <source>Commit changes to repository...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466"/> + <source>Add to repository</source> + <translation type="unfinished">Aggiungi al repository</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="469"/> + <source>Remove from repository (and disk)</source> + <translation type="unfinished">Rimuovi dal repository (e dal disco)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="391"/> + <source>Copy in repository</source> + <translation type="unfinished">Copia nel repository</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="393"/> + <source>Move in repository</source> + <translation type="unfinished">Muovi nel repository</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="396"/> + <source>Show log</source> + <translation type="unfinished">Mostra log</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="399"/> + <source>Show limited log</source> + <translation type="unfinished">Mostra log ridotto</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="402"/> + <source>Show log browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474"/> + <source>Show status</source> + <translation type="unfinished">Mostra stato</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="478"/> + <source>Show difference</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="481"/> - <source>Commit changes to repository...</source> - <translation type="unfinished"></translation> + <source>Show difference (extended)</source> + <translation type="unfinished">Mostra differenza (esteso)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="233"/> + <source>Show annotated file</source> + <translation type="unfinished">Mostra file appuntati</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="486"/> - <source>Add to repository</source> - <translation type="unfinished">Aggiungi al repository</translation> + <source>Revert changes</source> + <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="489"/> - <source>Remove from repository (and disk)</source> - <translation type="unfinished">Rimuovi dal repository (e dal disco)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="411"/> - <source>Copy in repository</source> - <translation type="unfinished">Copia nel repository</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="413"/> - <source>Move in repository</source> - <translation type="unfinished">Muovi nel repository</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="416"/> - <source>Show log</source> - <translation type="unfinished">Mostra log</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="419"/> - <source>Show limited log</source> - <translation type="unfinished">Mostra log ridotto</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="422"/> - <source>Show log browser</source> - <translation type="unfinished"></translation> + <source>Resolve conflict</source> + <translation type="unfinished">Risolvi conflitti</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="492"/> + <source>Select all local file entries</source> + <translation type="unfinished">Seleziona tutt i file locali</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="494"/> - <source>Show status</source> - <translation type="unfinished">Mostra stato</translation> + <source>Select all versioned file entries</source> + <translation type="unfinished">Seleziona tutti i file controllati</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="496"/> + <source>Select all local directory entries</source> + <translation type="unfinished">Seleziona tutte le directory locali</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> - <source>Show difference</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="501"/> - <source>Show difference (extended)</source> - <translation type="unfinished">Mostra differenza (esteso)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="248"/> - <source>Show annotated file</source> - <translation type="unfinished">Mostra file appuntati</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="506"/> - <source>Revert changes</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="509"/> - <source>Resolve conflict</source> - <translation type="unfinished">Risolvi conflitti</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="512"/> - <source>Select all local file entries</source> - <translation type="unfinished">Seleziona tutt i file locali</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="514"/> - <source>Select all versioned file entries</source> - <translation type="unfinished">Seleziona tutti i file controllati</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="516"/> - <source>Select all local directory entries</source> - <translation type="unfinished">Seleziona tutte le directory locali</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="518"/> <source>Select all versioned directory entries</source> <translation type="unfinished">Seleziona tutte le directory controllate</translation> </message> @@ -16126,7 +16254,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="607"/> <source>Repository Administration</source> <translation type="unfinished"></translation> </message> @@ -16145,6 +16273,51 @@ <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="571"/> + <source>Create changegroup</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> + <source>Create changegroup...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="574"/> + <source>Create changegroup file collecting changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Apply changegroups</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="585"/> + <source>Apply changegroups...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="588"/> + <source>Apply one or several changegroup files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> + <source>Changegroup Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> + <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="591"/> + <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> </context> <context> <name>HgRevisionSelectionDialog</name> @@ -16499,12 +16672,12 @@ <context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="104"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> <source>Mercurial status checked successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="115"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="114"/> <source>Could not start the Mercurial process.</source> <translation type="unfinished"></translation> </message> @@ -24632,7 +24805,7 @@ <translation>Stato VCS</translation> </message> <message> - <location filename="Project/ProjectBrowserModel.py" line="614"/> + <location filename="Project/ProjectBrowserModel.py" line="599"/> <source>local</source> <translation>locale</translation> </message>