diff -r 67b21645ffec -r ba6171edd33d eric6/i18n/eric6_it.ts --- a/eric6/i18n/eric6_it.ts Mon Mar 09 19:51:02 2020 +0100 +++ b/eric6/i18n/eric6_it.ts Mon Mar 09 19:51:19 2020 +0100 @@ -31446,7 +31446,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> @@ -31456,7 +31456,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3398"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> @@ -31576,62 +31576,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/> <source>Mercurial Bookmark</source> <translation type="unfinished">Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <source>Delete Bookmark</source> <translation type="unfinished">Cancella segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3547"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/> <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="3558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/> <source>Delete Mercurial Bookmark</source> <translation type="unfinished">Cancella Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/> <source>Rename Mercurial Bookmark</source> <translation type="unfinished">Rinomina Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/> <source>Move Mercurial Bookmark</source> <translation type="unfinished">Sposta Segnalibro Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <source>Pull Bookmark</source> <translation type="unfinished">Estrai Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3727"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/> <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="3739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/> <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="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <source>Push Bookmark</source> <translation type="unfinished">Inserisce Segnalibro</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/> <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="3783"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation type="unfinished">Inserisce segnalibro in un repository Mercurial remoto</translation> </message> @@ -32627,42 +32627,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="91"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="133"/> - <source>Did not receive the 'hello' message.</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="135"/> - <source>Received data on unexpected channel.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="140"/> + <source>Did not receive the 'hello' message.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="142"/> + <source>Received data on unexpected channel.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="147"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="152"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="153"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="160"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="165"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="352"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="383"/> <source>For message see output dialog.</source> <translation type="unfinished"></translation> </message> @@ -33077,7 +33077,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="73"/> <source>Input</source> - <translation type="obsolete">Input</translation> + <translation type="unfinished">Input</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> @@ -33087,12 +33087,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="98"/> <source>&Send</source> - <translation type="obsolete">&Spedisci</translation> + <translation type="unfinished">&Spedisci</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="101"/> <source>Alt+S</source> - <translation type="obsolete">Alt+S</translation> + <translation type="unfinished">Alt+S</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> @@ -33102,17 +33102,17 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="115"/> <source>Select to switch the input field to password mode</source> - <translation type="obsolete">Seleziona per impostare il campo di input in modalità password</translation> + <translation type="unfinished">Seleziona per impostare il campo di input in modalità password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="118"/> <source>&Password Mode</source> - <translation type="obsolete">Modo &Password</translation> + <translation type="unfinished">Modo &Password</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="121"/> <source>Alt+P</source> - <translation type="obsolete">Alt+P</translation> + <translation type="unfinished">Alt+P</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="172"/> @@ -33124,6 +33124,26 @@ <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="obsolete">Il processo {0} non può essere avviato. Assicurarsi che sia nel path.</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> + <source>Press to send the input to the subversion process</source> + <translation type="obsolete">Premi per mandare l'input al processo subversion</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> + <source>Enter data to be sent to the subversion process</source> + <translation type="obsolete">Inserisci i dati da mandare al processo subversion</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="95"/> + <source>Press to send the input to the Mercurial process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.ui" line="108"/> + <source>Enter data to be sent to the Mercurial process</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgDiffDialog</name> @@ -53597,17 +53617,17 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1621"/> + <location filename="../Preferences/__init__.py" line="1622"/> <source>Export Preferences</source> <translation>Esporta Preferenze</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Import Preferences</source> <translation>Importa Preferenze</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1649"/> + <location filename="../Preferences/__init__.py" line="1650"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>File proprietà (*.ini);;Tutti i file(*)</translation> </message> @@ -62813,27 +62833,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="242"/> <source>pyuic / pyside-uic Options</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="248"/> + <source>Indent Width:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> + <source>Select the indent width (default: 4)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="287"/> + <source>Generate imports relative to '.'</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="216"/> - <source>Indent Width:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="223"/> - <source>Select the indent width (default: 4)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="255"/> - <source>Generate imports relative to '.'</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="184"/> <source>Tools Directory:</source> <translation type="unfinished"></translation> </message> @@ -62853,10 +62873,20 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.py" line="67"/> + <location filename="../Preferences/ConfigurationPages/QtPage.py" line="72"/> <source>Sample: {0}designer{1}</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="210"/> + <source>PySide2 Tools</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="232"/> + <source>Enter the path of the PySide2 tools directory, if they are not found.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Queues</name> @@ -87013,12 +87043,12 @@ <translation type="obsolete">Inserisci il nome del foglio di stile</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="36"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="37"/> <source>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="62"/> + <location filename="../Preferences/ConfigurationPages/WebBrowserInterfacePage.py" line="63"/> <source>System</source> <translation type="unfinished">Sistema</translation> </message>