--- a/i18n/eric6_en.ts Tue Feb 24 18:31:14 2015 +0100 +++ b/i18n/eric6_en.ts Tue Feb 24 18:55:07 2015 +0100 @@ -4133,12 +4133,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="567"/> + <location filename="../Preferences/ConfigurationDialog.py" line="568"/> <source>Configuration Page Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationDialog.py" line="567"/> + <location filename="../Preferences/ConfigurationDialog.py" line="568"/> <source><p>The configuration page <b>{0}</b> could not be loaded.</p></source> <translation type="unfinished"></translation> </message> @@ -20703,102 +20703,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="89"/> - <source>Input</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="111"/> - <source>Press to send the input to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="114"/> - <source>&Send</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="117"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="124"/> - <source>Enter data to be sent to the hg process</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="131"/> - <source>Select to switch the input field to password mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="134"/> - <source>&Password Mode</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui" line="137"/> - <source>Alt+P</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="104"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="206"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="104"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="124"/> <source>There is no difference.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="252"/> <source>Save Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="219"/> <source>Patch Files (*.diff)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="236"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="252"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="95"/> <source>Patch Contents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="247"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="143"/> <source><Start></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="144"/> <source><End></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="47"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="46"/> <source>Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="49"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="48"/> <source>Press to refresh the display</source> <translation type="unfinished"></translation> </message> @@ -50204,12 +50164,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="151"/> <source>Process Generation Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py" line="151"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message>