--- a/i18n/eric5_it.ts Fri Dec 23 15:29:00 2011 +0100 +++ b/i18n/eric5_it.ts Fri Dec 23 17:48:33 2011 +0100 @@ -17067,95 +17067,105 @@ <translation>Difference</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="32"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="35"/> <source><b>Mercurial Diff</b><p>This shows the output of the hg diff command.</p></source> <translation><b>Mercurial Diff</b><p>Mostra l'output del comando hg diff.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="60"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="63"/> <source>Errors</source> <translation>Errori</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="82"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="85"/> <source>Input</source> <translation>Input</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="104"/> - <source>Press to send the input to the hg process</source> - <translation>Premi per spedire l'input al processo hg</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="107"/> - <source>&Send</source> - <translation>&Spedisci</translation> + <source>Press to send the input to the hg process</source> + <translation>Premi per spedire l'input al processo hg</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="110"/> + <source>&Send</source> + <translation>&Spedisci</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="113"/> <source>Alt+S</source> <translation>Alt+S</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="117"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="120"/> <source>Enter data to be sent to the hg process</source> <translation>Inserisci i dati da inviare al processo hg</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="124"/> - <source>Select to switch the input field to password mode</source> - <translation>Seleziona per impostare il campo di input in modalità password</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="127"/> - <source>&Password Mode</source> - <translation>Modo &Password</translation> + <source>Select to switch the input field to password mode</source> + <translation>Seleziona per impostare il campo di input in modalità password</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="130"/> + <source>&Password Mode</source> + <translation>Modo &Password</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="133"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="182"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> <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> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="215"/> <source>There is no difference.</source> <translation>Non ci sono differenze.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> <source>Save Diff</source> <translation>Salva Diff</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="316"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="395"/> <source>Patch Files (*.diff)</source> <translation>File Patch (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Il file <b>{0}</b> non può essere salvato.<br />Motivo: {1}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="333"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="412"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file patch <b>{0}</b> esiste già.Sovrascriverlo ?</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="113"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="115"/> <source>Patch Contents</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="228"/> + <source><Start></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> + <source><End></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgExportDialog</name> @@ -37052,22 +37062,22 @@ <context> <name>SvnDiffDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="152"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="158"/> <source>Subversion Diff</source> <translation>Subversion Diff</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="250"/> <source>There is no difference.</source> <translation>Non ci sono differenze.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="393"/> <source>Patch Files (*.diff)</source> <translation>File Patch (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="350"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="425"/> <source>Save Diff</source> <translation>Salva Diff</translation> </message> @@ -37077,87 +37087,97 @@ <translation>Difference</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.ui" line="32"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.ui" line="35"/> <source><b>Subversion Diff</b><p>This shows the output of the svn diff command.</p></source> <translation><b>Subversion Diff</b><p>Mostra l'output del comando svn diff.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.ui" line="60"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.ui" line="63"/> <source>Errors</source> <translation>Errori</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="82"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="85"/> <source>Input</source> <translation>Input</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="104"/> - <source>Press to send the input to the subversion process</source> - <translation>Premi per mandare l'input al processo subversion</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="107"/> - <source>&Send</source> - <translation>&Spedisci</translation> + <source>Press to send the input to the subversion process</source> + <translation>Premi per mandare l'input al processo subversion</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="110"/> + <source>&Send</source> + <translation>&Spedisci</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="113"/> <source>Alt+S</source> <translation>Alt+S</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="117"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="120"/> <source>Enter data to be sent to the subversion process</source> <translation>Inserisci i dati da mandare al processo subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="124"/> - <source>Select to switch the input field to password mode</source> - <translation>Seleziona per impostare il campo di input in modalità password</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="127"/> - <source>&Password Mode</source> - <translation>Modo &Password</translation> + <source>Select to switch the input field to password mode</source> + <translation>Seleziona per impostare il campo di input in modalità password</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="130"/> + <source>&Password Mode</source> + <translation>Modo &Password</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="133"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="166"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="152"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="158"/> <source>There is no temporary directory available.</source> <translation>Non c'è la directory temporanea disponibile.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="166"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> <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> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="350"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="425"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Il file <b>{0}</b> non può essere salvato.<br />Motivo: {1}</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="194"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="200"/> <source>Processing file '{0}'... </source> <translation>Processo file '{0}'... </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="335"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="410"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Il file patch <b>{0}</b> esiste già.Sovrascriverlo ?</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="317"/> + <source><Start></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="318"/> + <source><End></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnInfoDialog</name>