--- a/i18n/eric5_it.ts Wed Apr 02 19:08:31 2014 +0200 +++ b/i18n/eric5_it.ts Thu Apr 03 19:12:51 2014 +0200 @@ -20151,12 +20151,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="140"/> <source>Process Generation Error</source> <translation>Errore Generazione Processo</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="140"/> <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> @@ -22854,12 +22854,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="531"/> <source>Show difference</source> - <translation>Mostra differenza</translation> + <translation type="obsolete">Mostra differenza</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="535"/> <source>Show difference (extended)</source> - <translation>Mostra differenza (esteso)</translation> + <translation type="obsolete">Mostra differenza (esteso)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="256"/> @@ -22927,13 +22927,23 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="531"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="242"/> - <source>Show difference side-by-side</source> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="535"/> + <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="251"/> - <source>Show difference side-by-side (extended)</source> + <source>Show differences side-by-side (extended)</source> <translation type="unfinished"></translation> </message> </context> @@ -23172,7 +23182,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> <source>Show difference</source> - <translation>Mostra differenza</translation> + <translation type="obsolete">Mostra differenza</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> @@ -23187,12 +23197,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="282"/> <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> + <translation type="obsolete"><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="290"/> <source>Show difference (extended)</source> - <translation>Mostra differenza (esteso)</translation> + <translation type="obsolete">Mostra differenza (esteso)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> @@ -23202,7 +23212,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> <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> + <translation type="obsolete"><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="306"/> @@ -24234,6 +24244,26 @@ <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="274"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="282"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -49807,12 +49837,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="690"/> <source>Show difference</source> - <translation>Mostra differenza</translation> + <translation type="obsolete">Mostra differenza</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="694"/> <source>Show difference (extended)</source> - <translation>Mostra differenza (esteso)</translation> + <translation type="obsolete">Mostra differenza (esteso)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="705"/> @@ -49907,7 +49937,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="699"/> <source>Show difference (URLs)</source> - <translation>Mostra differenze (URL)</translation> + <translation type="obsolete">Mostra differenze (URL)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="568"/> @@ -49945,13 +49975,28 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="690"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="274"/> - <source>Show difference side-by-side</source> + <source>Show differences side-by-side</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="694"/> + <source>Show differences (extended)</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="283"/> - <source>Show difference side-by-side (extended)</source> + <source>Show differences side-by-side (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py" line="699"/> + <source>Show differences (URLs)</source> <translation type="unfinished"></translation> </message> </context> @@ -50080,7 +50125,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> <source>Show difference</source> - <translation>Mostra differenze</translation> + <translation type="obsolete">Mostra differenze</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> @@ -50095,12 +50140,12 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> <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> + <translation type="obsolete"><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="144"/> <source>Show difference (extended)</source> - <translation>Mostra differenza (esteso)</translation> + <translation type="obsolete">Mostra differenza (esteso)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="149"/> @@ -50110,7 +50155,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> <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> + <translation type="obsolete"><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="176"/> @@ -50485,7 +50530,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="160"/> <source>Show difference (URLs)</source> - <translation>Mostra differenze (URLs)</translation> + <translation type="obsolete">Mostra differenze (URLs)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="165"/> @@ -50495,7 +50540,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> <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> + <translation type="obsolete"><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="111"/> @@ -50607,6 +50652,36 @@ <source><b>Upgrade</b><p>Upgrades the working copy to the current format.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="128"/> + <source>Show differences</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="136"/> + <source><b>Show differences</b><p>This shows differences of the local project to the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="144"/> + <source>Show differences (extended)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="152"/> + <source><b>Show differences (extended)</b><p>This shows differences of selectable revisions of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="160"/> + <source>Show differences (URLs)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py" line="168"/> + <source><b>Show differences (URLs)</b><p>This shows differences of the project between two repository URLs.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>SvnPropDelDialog</name>