--- 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>
