--- a/i18n/eric5_it.ts Fri Sep 09 12:29:45 2011 +0200 +++ b/i18n/eric5_it.ts Fri Sep 09 19:15:06 2011 +0200 @@ -3834,7 +3834,7 @@ <context> <name>DebugUI</name> <message> - <location filename="Debugger/DebugUI.py" line="1574"/> + <location filename="Debugger/DebugUI.py" line="1586"/> <source>Run Script</source> <translation>Esegui Script</translation> </message> @@ -3854,7 +3854,7 @@ <translation><b>Esegui Script</b><p>Imposta gli argomenti della linea di comando ed esegue lo script al di fuori del debugger. Se il file non è stato salvato può essere salvato prima.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1587"/> + <location filename="Debugger/DebugUI.py" line="1599"/> <source>Run Project</source> <translation>Esegui Progetto</translation> </message> @@ -3954,7 +3954,7 @@ <translation><b>Profila Progetto</b><p>Imposta gli argomenti della linea di comando e profila il progetto. Se file del progetto corrente non sono stati salvati, è possibile salvarli prima.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1684"/> + <location filename="Debugger/DebugUI.py" line="1696"/> <source>Debug Script</source> <translation>Debug dello script</translation> </message> @@ -3974,7 +3974,7 @@ <translation><b>Debug dello Script</b><p>Imposta gli argomenti della linea di comando e imposta la linea corrente per essere la prima istruzione eseguibile di Python della finestra dell'editor. Se il file ha modifiche non salvate è possibile salvarle prima.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1697"/> + <location filename="Debugger/DebugUI.py" line="1709"/> <source>Debug Project</source> <translation>Debug del Progetto</translation> </message> @@ -4109,7 +4109,7 @@ <translation><b>Stop</b><p>Ferma la sessione di debug.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1946"/> + <location filename="Debugger/DebugUI.py" line="1958"/> <source>Evaluate</source> <translation>Valuta</translation> </message> @@ -4124,7 +4124,7 @@ <translation>Valuta nel contesto corrente</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1975"/> + <location filename="Debugger/DebugUI.py" line="1987"/> <source>Execute</source> <translation>Esegui</translation> </message> @@ -4234,47 +4234,47 @@ <translation>Un'eccezione non gestita è occorso. Guarda la finestra di shell per dettagli.</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1079"/> + <location filename="Debugger/DebugUI.py" line="1091"/> <source>The program being debugged has terminated unexpectedly.</source> <translation>Il programma debuggato è terminato in maniera inaspettata.</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1371"/> + <location filename="Debugger/DebugUI.py" line="1383"/> <source>Coverage of Project</source> <translation>Analisi del Progetto</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1361"/> + <location filename="Debugger/DebugUI.py" line="1373"/> <source>Coverage of Script</source> <translation>Analisi delle Script</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1587"/> + <location filename="Debugger/DebugUI.py" line="1599"/> <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> <message> - <location filename="Debugger/DebugUI.py" line="1478"/> + <location filename="Debugger/DebugUI.py" line="1490"/> <source>Profile of Project</source> <translation>Profilazione del progetto</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1467"/> + <location filename="Debugger/DebugUI.py" line="1479"/> <source>Profile of Script</source> <translation>Profilazione dello script</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1697"/> + <location filename="Debugger/DebugUI.py" line="1709"/> <source>There is no main script defined for the current project. No debugging possible.</source> <translation>Non c'è uno script principale per il progetto. Non è possibile il debug.</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1946"/> + <location filename="Debugger/DebugUI.py" line="1958"/> <source>Enter the statement to evaluate</source> <translation>Inserisci l'istruzione da valutare</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1975"/> + <location filename="Debugger/DebugUI.py" line="1987"/> <source>Enter the statement to execute</source> <translation>Inserisci l'istruzione da eseguire</translation> </message> @@ -4319,7 +4319,7 @@ <translation><b>Filtro tipo variabili</b><p>Configura il filtro per i tipi variabile. Solo i tipi di variabile che non sono selezionati sono mostrati nella finestra delle variabili globali o locali durante una sessione di debug. </p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1148"/> + <location filename="Debugger/DebugUI.py" line="1160"/> <source>Breakpoint Condition Error</source> <translation>Errore condizione di interruzione</translation> </message> @@ -4382,12 +4382,12 @@ <translation><b>Valuta</b><p>Valuta un'espressione nel contesto corrente del programma debuggato. Il risultato è mostrato nella shell.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1179"/> + <location filename="Debugger/DebugUI.py" line="1191"/> <source>Watch Expression Error</source> <translation>Errore espressione di watch</translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1214"/> + <location filename="Debugger/DebugUI.py" line="1226"/> <source>Watch expression already exists</source> <translation>L'espressione di controllo esiste già</translation> </message> @@ -4439,32 +4439,32 @@ <translation><p>Il file <b>{0}</b> contiene l'errore di sintassi <b>{1}</b> alla linea <b>{2}</b>, carattere <b>{3}</b>.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1034"/> + <location filename="Debugger/DebugUI.py" line="1046"/> <source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"<br>File: <b>{2}</b>, Line: <b>{3}</b></p><p>Break here?</p></source> <translation><p>Il programma in debug ha sollevato un'eccezione <b>{0}</b><br>"<b>{1}</b>"<br>File: <b>{2}</b>, Linea: <b>{3}</b></p><p>Interrompere qui ?</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1045"/> + <location filename="Debugger/DebugUI.py" line="1057"/> <source><p>The debugged program raised the exception <b>{0}</b><br>"<b>{1}</b>"</p></source> <translation><p>Il programma debuggato ha sollevato un'eccezione <b>{0}</b><br>"<b>{1}</b>"</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1148"/> + <location filename="Debugger/DebugUI.py" line="1160"/> <source><p>The condition of the breakpoint <b>{0}, {1}</b> contains a syntax error.</p></source> <translation><p>La condizione del breakpoint <b>{0}, {1}</b> contiene un errore di sintassi.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1179"/> + <location filename="Debugger/DebugUI.py" line="1191"/> <source><p>The watch expression <b>{0}</b> contains a syntax error.</p></source> <translation><p>L'espressione <b>{0}</b> contiene un errore di sintassi.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1206"/> + <location filename="Debugger/DebugUI.py" line="1218"/> <source><p>A watch expression '<b>{0}</b>' already exists.</p></source> <translation><p>L'espressione '<b>{0}</b>' esiste già.</p></translation> </message> <message> - <location filename="Debugger/DebugUI.py" line="1210"/> + <location filename="Debugger/DebugUI.py" line="1222"/> <source><p>A watch expression '<b>{0}</b>' for the variable <b>{1}</b> already exists.</p></source> <translation><p>L'espressione '<b>{0}</b>' per la variabile <b>{1}</b> esiste già.</p></translation> </message> @@ -15395,42 +15395,42 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/> <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="246"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/> <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="248"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/> <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="274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> <source>Create project repository</source> <translation>Crea il repository del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="274"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> <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="302"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> <source>Creating Mercurial repository</source> <translation>Creazione repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/> <source>Initial commit to Mercurial repository</source> <translation>Commit iniziale nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="364"/> <source>Cloning project from a Mercurial repository</source> <translation>Clonazione del progetto dal repository Mercurial</translation> </message> @@ -15440,47 +15440,47 @@ <translation type="obsolete">Commit delle modifiche nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="518"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/> <source>Synchronizing with the Mercurial repository</source> <translation>Sincronizzazione con il repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="570"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/> <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="634"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="635"/> <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="698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/> <source>Renaming {0}</source> <translation>Rinomino {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="827"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="828"/> <source>Taging in the Mercurial repository</source> <translation>Creazione tag nel repository Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="857"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="860"/> <source>Reverting changes</source> <translation>Annullamento modifiche</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="905"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="910"/> <source>Merging</source> <translation>Merge</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1144"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1149"/> <source>Mercurial command</source> <translation>Comando Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1334"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1339"/> <source>Copying {0}</source> <translation>Copia di {0}</translation> </message> @@ -15495,170 +15495,175 @@ <translation type="obsolete">Mostra il numero di elementi da mostrare.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1579"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1584"/> <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="1629"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1637"/> <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="1748"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1756"/> <source>Resolving files/directories</source> <translation>Risoluzione di file/directory</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Create Branch</source> <translation>Creazione Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1769"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1777"/> <source>Enter branch name</source> <translation>Inserisci il nome del Branch</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1780"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1788"/> <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="1861"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1869"/> <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="1886"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1894"/> <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="1909"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1917"/> <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="1932"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1940"/> <source>Recovering from interrupted transaction</source> <translation>Recupero da una transazione interrotta</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2170"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/> <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="1804"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1812"/> <source>Showing current branch</source> <translation>Visualizzazione branch corrente</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2079"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2087"/> <source>Create changegroup</source> <translation>Crea changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2190"/> <source>Apply changegroups</source> <translation>Applica changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Sottocomando Bisect ({0}) non valido.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2241"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial Bisect ({0})</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2131"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2139"/> <source>Preview changegroup</source> <translation>Anteprima changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1955"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1963"/> <source>Identifying project directory</source> <translation>Identificazione directory del progetto</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <source>Create .hgignore file</source> <translation>Crea il file .hgignore</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1986"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1994"/> <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="2265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2273"/> <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="2037"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2045"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial Changegroup Files (*.hg)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2164"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2172"/> <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="2141"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2149"/> <source>Identifying changegroup file</source> <translation>Identifica i file changegroup</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2321"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2329"/> <source>Backing out changeset</source> <translation>Ritiro changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2309"/> <source>No revision given. Aborting...</source> <translation>Nessuna revisione fornita. Termino...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2054"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2346"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2341"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2349"/> <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="466"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="467"/> <source>Committing changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2384"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2447"/> <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="2497"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/> <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="2421"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAnnotateDialog</name> @@ -17022,6 +17027,104 @@ </message> </context> <context> + <name>HgImportDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="14"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="23"/> + <source>Commit data</source> + <translation type="unfinished">Commit dei dati</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="29"/> + <source>Select to not commit the imported patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="32"/> + <source>Do not commit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="42"/> + <source>Commit message:</source> + <translation type="unfinished">Messaggio di commit:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="49"/> + <source>Enter the commit message or leave empty to use the default one</source> + <translation type="unfinished">Inserisci il messaggio per la commit o lascia vuoto per usare quello di default</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="61"/> + <source>Commit Date:</source> + <translation type="unfinished">Data della commit:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="68"/> + <source>Enter optional date for the commit</source> + <translation type="unfinished">Inserisci formato data opzionale</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="94"/> + <source>Commit User:</source> + <translation type="unfinished">Utente della commit:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="101"/> + <source>Enter optional user for the commit</source> + <translation type="unfinished">Inserisci utente per la commit opzionale</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="113"/> + <source>Strip Count:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="122"/> + <source>Enter number of leading directories to strip off (default 1)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="153"/> + <source>Patch File:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="162"/> + <source>Enter the name of the patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="169"/> + <source>Press to select the patch file via a file selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="181"/> + <source>Select to enforce the import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="184"/> + <source>Enforce Import</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/> + <source>Select patch file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/> + <source>Patch Files (*.diff *.patch);;All Files (*)</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgLogBrowserDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/> @@ -17890,17 +17993,17 @@ <translation>Seleziona tutte le directory controllate</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> <source>Remove from repository only</source> <translation>Rimuovi solo dal repository</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="611"/> <source>Do you really want to remove these translation files from the repository?</source> <translation>Vuoi veramente rimuovere questi file di traduzione dal repository ?</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="622"/> <source>Do you really want to remove these files from the repository?</source> <translation>Vuoi veramente rimuovere questi file dal repository ?</translation> </message> @@ -18593,7 +18696,7 @@ <translation><b>Recover</b><p>Recupera da una transazione interrotta.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="836"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/> <source>Repository Administration</source> <translation>Amministrazione repository</translation> </message> @@ -18628,7 +18731,7 @@ <translation>Crea un file changegroup che colleziona i changeset</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/> <source>Apply changegroups</source> <translation>Applica changegroups</translation> </message> @@ -18643,7 +18746,7 @@ <translation>Applica una o più file changegroups</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="866"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/> <source>Changegroup Management</source> <translation>Changegroup Management</translation> </message> @@ -18733,7 +18836,7 @@ <translation><b>Reset</b><p>Reset dei dati di ricerca bisect.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> <source>Bisect</source> <translation>Bisect</translation> </message> @@ -18858,17 +18961,17 @@ <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="859"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source>Specials</source> <translation>Speciali</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1016"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/> <source>Pull</source> <translation>Pull</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1178"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> <source>The project should be reread. Do this now?</source> <translation>Il progetto deve essere riletto. Farlo ora ?</translation> </message> @@ -18903,7 +19006,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="882"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> @@ -18982,6 +19085,36 @@ <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="1252"/> + <source>Import Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <source>Import Patch...</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> + <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="887"/> + <source>Patch Management</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/> + <source>Revert Changes</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -39691,7 +39824,7 @@ <translation>Premi per mostrare tutti i file che contengono errori di sintassi</translation> </message> <message> - <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="273"/> + <location filename="Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="274"/> <source>No issues found.</source> <translation>Nessun problema trovato.</translation> </message> @@ -45117,17 +45250,17 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="1037"/> + <location filename="Utilities/__init__.py" line="1058"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>Puoi usare i codici % come segnaposti nella stringa. I codici supportati sono: <table><tr><td>%C</td><td>colonna del cursore nell'editor attuale</td></tr><tr><td>%D</td><td>directory dell'editor attuale</td></tr><tr><td>%F</td><td>nome file dell'editor corrente</td></tr><tr><td>%H</td><td>directory home dell'utente attuale</td></tr><tr><td>%L</td><td>linea del cursore dell'editor attuale</td></tr><tr><td>%P</td><td>percorso del progetto attuale</td></tr><tr><td>%S</td><td>testo selezionato dell'editor attuale</td></tr><tr><td>%U</td><td>username dell'utente attuale</td></tr><tr><td>%%</td><td>Segno percentuale</td></tr></table></p></translation> </message> <message> - <location filename="Utilities/__init__.py" line="1223"/> + <location filename="Utilities/__init__.py" line="1244"/> <source>Python2 interpreter not configured.</source> <translation>Interprete Python2 non configurato.</translation> </message> <message> - <location filename="Utilities/__init__.py" line="1270"/> + <location filename="Utilities/__init__.py" line="1291"/> <source>Python2 interpreter did not finish within 30s.</source> <translation>L'interprete Python2 non ha finito entro i 30s.</translation> </message> @@ -49038,24 +49171,24 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1204"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1209"/> <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="1698"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1706"/> <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="1706"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1714"/> <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="1220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1225"/> <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> @@ -49064,7 +49197,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1250"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1255"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -49081,24 +49214,24 @@ {2}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1692"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1700"/> <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="1694"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> <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="1710"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1718"/> <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="1713"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1721"/> <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> @@ -49108,7 +49241,7 @@ <tr><td><b>Committed time</b></td><td>{2}</td></tr></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1710"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message>