diff -r 0b18c86c03a1 -r 11ea3d31937a i18n/eric6_it.ts
--- a/i18n/eric6_it.ts Fri Feb 16 20:18:29 2018 +0100
+++ b/i18n/eric6_it.ts Sat Feb 17 14:59:26 2018 +0100
@@ -29399,117 +29399,117 @@
<translation>Pushing in un repository Mercurial remoto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2213"/>
<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="2357"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2361"/>
<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="2382"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2386"/>
<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="2406"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2410"/>
<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="2430"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2434"/>
<source>Recovering from interrupted transaction</source>
<translation>Recupero da una transazione interrotta</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2668"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2672"/>
<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="2238"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/>
<source>Showing current branch</source>
<translation>Visualizzazione branch corrente</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2599"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/>
<source>Create changegroup</source>
<translation>Crea changegroup</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2680"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2684"/>
<source>Apply changegroups</source>
<translation>Applica changegroup</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2703"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation>Sottocomando Bisect ({0}) non valido.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2729"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2733"/>
<source>Mercurial Bisect ({0})</source>
<translation>Mercurial Bisect ({0})</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2624"/>
<source>Preview changegroup</source>
<translation>Anteprima changegroup</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2454"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2458"/>
<source>Identifying project directory</source>
<translation>Identificazione directory del progetto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/>
<source>Create .hgignore file</source>
<translation>Crea il file .hgignore</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2496"/>
<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="2761"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2765"/>
<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="2556"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2560"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation>Mercurial Changegroup Files (*.hg)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2663"/>
<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="2815"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2819"/>
<source>Backing out changeset</source>
<translation>Ritiro changeset</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2795"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2799"/>
<source>No revision given. Aborting...</source>
<translation>Nessuna revisione fornita. Termino...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2573"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2577"/>
<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="2842"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2846"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2835"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2839"/>
<source>Are you sure you want to rollback the last transaction?</source>
<translation type="unfinished"></translation>
</message>
@@ -29519,72 +29519,72 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3497"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/>
<source>Mercurial Command Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3352"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3356"/>
<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="3497"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3501"/>
<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="2910"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2914"/>
<source>Import Patch</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2957"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2961"/>
<source>Export Patches</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3004"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3008"/>
<source>Change Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3057"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3061"/>
<source>Copy Changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3083"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3087"/>
<source>Copy Changesets (Continue)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3221"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3225"/>
<source>Add Sub-repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3254"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3258"/>
<source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3202"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3206"/>
<source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/>
<source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3273"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/>
<source>Remove Sub-repositories</source>
<translation type="unfinished">Rimuovi sotto-archivi</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3242"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/>
<source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source>
<translation type="unfinished"></translation>
</message>
@@ -29614,7 +29614,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3118"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3122"/>
<source>Create Unversioned Archive</source>
<translation type="unfinished"></translation>
</message>
@@ -29639,7 +29639,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2216"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2220"/>
<source>Created new branch <{0}>.</source>
<translation type="unfinished"></translation>
</message>
@@ -29649,67 +29649,62 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/>
- <source>Cancelling uncommitted merge</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3616"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3620"/>
<source>Mercurial Bookmark</source>
<translation type="unfinished">Segnalibro Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/>
<source>Delete Bookmark</source>
<translation type="unfinished">Cancella segnalibro</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3638"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/>
<source>Select the bookmark to be deleted:</source>
<translation type="unfinished">Seleziona il segnalibro da cancellare:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3649"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3653"/>
<source>Delete Mercurial Bookmark</source>
<translation type="unfinished">Cancella Segnalibro Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3682"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3686"/>
<source>Rename Mercurial Bookmark</source>
<translation type="unfinished">Rinomina Segnalibro Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3728"/>
<source>Move Mercurial Bookmark</source>
<translation type="unfinished">Sposta Segnalibro Mercurial</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/>
<source>Pull Bookmark</source>
<translation type="unfinished">Estrai Segnalibro</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3819"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/>
<source>Select the bookmark to be pulled:</source>
<translation type="unfinished">Seleziona il segnalibro da estrarre:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3831"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3835"/>
<source>Pulling bookmark from a remote Mercurial repository</source>
<translation type="unfinished">Etrae segnalibro da un repository Mercurial remoto</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/>
<source>Push Bookmark</source>
<translation type="unfinished">Inserisce Segnalibro</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3863"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3867"/>
<source>Select the bookmark to be push:</source>
<translation type="unfinished">Seleziona il segnalibro da inserire:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3875"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3879"/>
<source>Pushing bookmark to a remote Mercurial repository</source>
<translation type="unfinished">Inserisce segnalibro in un repository Mercurial remoto</translation>
</message>
@@ -29744,15 +29739,20 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/>
<source>Delete All Backups</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3135"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/>
<source><p>Do you really want to delete all backup bundles stored the backup area <b>{0}</b>?</p></source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/>
+ <source>Canceling uncommitted merge</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgAddSubrepositoryDialog</name>
@@ -41882,6 +41882,11 @@
<source>Allow to access the clipboard</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../WebBrowser/StatusBar/JavaScriptSettingsDialog.ui" line="23"/>
+ <source>Select to enable JavaScript support</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Largefiles</name>
