Mercurial Repositories > eric / changeset
changeset
Corrected some inconsitencies.
Thu, 03 Apr 2014 18:53:58 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Thu, 03 Apr 2014 18:53:58 +0200
- changeset 3471
- 31a6d4300906
- parent 3469
- 53a53c45a3f0
- child 3472
- 9ea593813385
Corrected some inconsitencies.
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Wed Apr 02 19:08:31 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Thu Apr 03 18:53:58 2014 +0200 @@ -323,20 +323,20 @@ menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference'), self._VCSDiff) + self.tr('Show differences'), self._VCSDiff) self.vcsMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsSbsDiff.png"), - self.tr('Show difference side-by-side'), self.__HgSbsDiff) + self.tr('Show differences side-by-side'), self.__HgSbsDiff) self.vcsMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference (extended)'), + self.tr('Show differences (extended)'), self.__HgExtendedDiff) self.vcsMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsSbsDiff.png"), - self.tr('Show difference side-by-side (extended)'), + self.tr('Show differences side-by-side (extended)'), self.__HgSbsExtendedDiff) self.vcsMenuActions.append(act) self.annotateAct = menu.addAction( @@ -349,7 +349,7 @@ self.tr('Revert changes'), self.__HgRevert) self.vcsMenuActions.append(act) act = menu.addAction( - self.tr('Conflict resolved'), self.__HgResolve) + self.tr('Conflicts resolved'), self.__HgResolve) self.vcsMenuActions.append(act) menu.addSeparator() menu.addAction(self.tr('Select all local file entries'), @@ -417,11 +417,11 @@ menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference'), self._VCSDiff) + self.tr('Show differences'), self._VCSDiff) self.vcsMultiMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference (extended)'), + self.tr('Show differences (extended)'), self.__HgExtendedDiff) self.vcsMultiMenuActions.append(act) menu.addSeparator() @@ -430,7 +430,7 @@ self.tr('Revert changes'), self.__HgRevert) self.vcsMultiMenuActions.append(act) act = menu.addAction( - self.tr('Conflict resolved'), self.__HgResolve) + self.tr('Conflicts resolved'), self.__HgResolve) self.vcsMultiMenuActions.append(act) menu.addSeparator() menu.addAction(self.tr('Select all local file entries'), @@ -541,11 +541,11 @@ menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference'), self._VCSDiff) + self.tr('Show differences'), self._VCSDiff) self.vcsDirMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference (extended)'), + self.tr('Show differences (extended)'), self.__HgExtendedDiff) self.vcsDirMenuActions.append(act) menu.addSeparator() @@ -554,7 +554,7 @@ self.tr('Revert changes'), self.__HgRevert) self.vcsDirMenuActions.append(act) act = menu.addAction( - self.tr('Conflict resolved'), self.__HgResolve) + self.tr('Conflicts resolved'), self.__HgResolve) self.vcsDirMenuActions.append(act) menu.addSeparator() menu.addAction(self.tr('Select all local file entries'), @@ -619,11 +619,11 @@ menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference'), self._VCSDiff) + self.tr('Show differences'), self._VCSDiff) self.vcsDirMultiMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference (extended)'), + self.tr('Show differences (extended)'), self.__HgExtendedDiff) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() @@ -632,7 +632,7 @@ self.tr('Revert changes'), self.__HgRevert) self.vcsDirMultiMenuActions.append(act) act = menu.addAction( - self.tr('Conflict resolved'), self.__HgResolve) + self.tr('Conflicts resolved'), self.__HgResolve) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() menu.addAction(self.tr('Select all local file entries'),
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Wed Apr 02 19:08:31 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Thu Apr 03 18:53:58 2014 +0200 @@ -278,7 +278,7 @@ self.actions.append(self.hgLogBrowserAct) self.vcsDiffAct = E5Action( - self.tr('Show difference'), + self.tr('Show differences'), UI.PixmapCache.getIcon("vcsDiff.png"), self.tr('Show &difference'), 0, 0, self, 'mercurial_diff') @@ -286,7 +286,7 @@ 'Show the difference of the local project to the repository' )) self.vcsDiffAct.setWhatsThis(self.tr( - """<b>Show difference</b>""" + """<b>Show differences</b>""" """<p>This shows the difference of the local project to the""" """ repository.</p>""" )) @@ -294,15 +294,15 @@ self.actions.append(self.vcsDiffAct) self.hgExtDiffAct = E5Action( - self.tr('Show difference (extended)'), + self.tr('Show differences (extended)'), UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference (extended)'), + self.tr('Show differences (extended)'), 0, 0, self, 'mercurial_extendeddiff') self.hgExtDiffAct.setStatusTip(self.tr( 'Show the difference of revisions of the project to the repository' )) self.hgExtDiffAct.setWhatsThis(self.tr( - """<b>Show difference (extended)</b>""" + """<b>Show differences (extended)</b>""" """<p>This shows the difference of selectable revisions of the""" """ project.</p>""" ))
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Wed Apr 02 19:08:31 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py Thu Apr 03 18:53:58 2014 +0200 @@ -269,25 +269,25 @@ menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference'), self._VCSDiff) + self.tr('Show differences'), self._VCSDiff) self.vcsMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsSbsDiff.png"), - self.tr('Show difference side-by-side'), self.__SVNSbsDiff) + self.tr('Show differences side-by-side'), self.__SVNSbsDiff) self.vcsMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference (extended)'), + self.tr('Show differences (extended)'), self.__SVNExtendedDiff) self.vcsMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsSbsDiff.png"), - self.tr('Show difference side-by-side (extended)'), + self.tr('Show differences side-by-side (extended)'), self.__SVNSbsExtendedDiff) self.vcsMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference (URLs)'), + self.tr('Show differences (URLs)'), self.__SVNUrlDiff) self.vcsMenuActions.append(act) self.blameAct = menu.addAction( @@ -304,7 +304,7 @@ self.tr('Merge changes'), self._VCSMerge) self.vcsMenuActions.append(act) act = menu.addAction( - self.tr('Conflict resolved'), self.__SVNResolve) + self.tr('Conflicts resolved'), self.__SVNResolve) self.vcsMenuActions.append(act) menu.addSeparator() act = menu.addAction( @@ -410,16 +410,16 @@ menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference'), self._VCSDiff) + self.tr('Show differences'), self._VCSDiff) self.vcsMultiMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference (extended)'), + self.tr('Show differences (extended)'), self.__SVNExtendedDiff) self.vcsMultiMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference (URLs)'), + self.tr('Show differences (URLs)'), self.__SVNUrlDiff) self.vcsMultiMenuActions.append(act) menu.addSeparator() @@ -428,7 +428,7 @@ self.tr('Revert changes'), self._VCSRevert) self.vcsMultiMenuActions.append(act) act = menu.addAction( - self.tr('Conflict resolved'), self.__SVNResolve) + self.tr('Conflicts resolved'), self.__SVNResolve) self.vcsMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction( @@ -581,16 +581,16 @@ menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference'), self._VCSDiff) + self.tr('Show differences'), self._VCSDiff) self.vcsDirMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference (extended)'), + self.tr('Show differences (extended)'), self.__SVNExtendedDiff) self.vcsDirMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference (URLs)'), + self.tr('Show differences (URLs)'), self.__SVNUrlDiff) self.vcsDirMenuActions.append(act) menu.addSeparator() @@ -603,7 +603,7 @@ self.tr('Merge changes'), self._VCSMerge) self.vcsDirMenuActions.append(act) act = menu.addAction( - self.tr('Conflict resolved'), self.__SVNResolve) + self.tr('Conflicts resolved'), self.__SVNResolve) self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) @@ -689,16 +689,16 @@ menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference'), self._VCSDiff) + self.tr('Show differences'), self._VCSDiff) self.vcsDirMultiMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference (extended)'), + self.tr('Show differences (extended)'), self.__SVNExtendedDiff) self.vcsDirMultiMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference (URLs)'), + self.tr('Show differences (URLs)'), self.__SVNUrlDiff) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() @@ -711,7 +711,7 @@ self.tr('Merge changes'), self._VCSMerge) self.vcsDirMultiMenuActions.append(act) act = menu.addAction( - self.tr('Conflict resolved'), self.__SVNResolve) + self.tr('Conflicts resolved'), self.__SVNResolve) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp)
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Wed Apr 02 19:08:31 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Thu Apr 03 18:53:58 2014 +0200 @@ -126,7 +126,7 @@ self.actions.append(self.svnLogBrowserAct) self.vcsDiffAct = E5Action( - self.tr('Show difference'), + self.tr('Show differences'), UI.PixmapCache.getIcon("vcsDiff.png"), self.tr('Show &difference'), 0, 0, self, 'subversion_diff') @@ -134,7 +134,7 @@ 'Show the difference of the local project to the repository' )) self.vcsDiffAct.setWhatsThis(self.tr( - """<b>Show difference</b>""" + """<b>Show differences</b>""" """<p>This shows the difference of the local project to the""" """ repository.</p>""" )) @@ -142,15 +142,15 @@ self.actions.append(self.vcsDiffAct) self.svnExtDiffAct = E5Action( - self.tr('Show difference (extended)'), + self.tr('Show differences (extended)'), UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference (extended)'), + self.tr('Show differences (extended)'), 0, 0, self, 'subversion_extendeddiff') self.svnExtDiffAct.setStatusTip(self.tr( 'Show the difference of revisions of the project to the repository' )) self.svnExtDiffAct.setWhatsThis(self.tr( - """<b>Show difference (extended)</b>""" + """<b>Show differences (extended)</b>""" """<p>This shows the difference of selectable revisions of""" """ the project.</p>""" )) @@ -158,15 +158,15 @@ self.actions.append(self.svnExtDiffAct) self.svnUrlDiffAct = E5Action( - self.tr('Show difference (URLs)'), + self.tr('Show differences (URLs)'), UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference (URLs)'), + self.tr('Show differences (URLs)'), 0, 0, self, 'subversion_urldiff') self.svnUrlDiffAct.setStatusTip(self.tr( 'Show the difference of the project between two repository URLs' )) self.svnUrlDiffAct.setWhatsThis(self.tr( - """<b>Show difference (URLs)</b>""" + """<b>Show differences (URLs)</b>""" """<p>This shows the difference of the project between""" """ two repository URLs.</p>""" ))
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Wed Apr 02 19:08:31 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py Thu Apr 03 18:53:58 2014 +0200 @@ -263,25 +263,25 @@ menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference'), self._VCSDiff) + self.tr('Show differences'), self._VCSDiff) self.vcsMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsSbsDiff.png"), - self.tr('Show difference side-by-side'), self.__SVNSbsDiff) + self.tr('Show differences side-by-side'), self.__SVNSbsDiff) self.vcsMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference (extended)'), + self.tr('Show differences (extended)'), self.__SVNExtendedDiff) self.vcsMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsSbsDiff.png"), - self.tr('Show difference side-by-side (extended)'), + self.tr('Show differences side-by-side (extended)'), self.__SVNSbsExtendedDiff) self.vcsMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference (URLs)'), + self.tr('Show differences (URLs)'), self.__SVNUrlDiff) self.vcsMenuActions.append(act) self.blameAct = menu.addAction( @@ -298,7 +298,7 @@ self.tr('Merge changes'), self._VCSMerge) self.vcsMenuActions.append(act) act = menu.addAction( - self.tr('Conflict resolved'), self.__SVNResolve) + self.tr('Conflicts resolved'), self.__SVNResolve) self.vcsMenuActions.append(act) if self.vcs.version >= (1, 2, 0): menu.addSeparator() @@ -406,16 +406,16 @@ menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference'), self._VCSDiff) + self.tr('Show differences'), self._VCSDiff) self.vcsMultiMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference (extended)'), + self.tr('Show differences (extended)'), self.__SVNExtendedDiff) self.vcsMultiMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference (URLs)'), + self.tr('Show differences (URLs)'), self.__SVNUrlDiff) self.vcsMultiMenuActions.append(act) menu.addSeparator() @@ -424,7 +424,7 @@ self.tr('Revert changes'), self._VCSRevert) self.vcsMultiMenuActions.append(act) act = menu.addAction( - self.tr('Conflict resolved'), self.__SVNResolve) + self.tr('Conflicts resolved'), self.__SVNResolve) self.vcsMultiMenuActions.append(act) if self.vcs.version >= (1, 2, 0): menu.addSeparator() @@ -576,16 +576,16 @@ menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference'), self._VCSDiff) + self.tr('Show differences'), self._VCSDiff) self.vcsDirMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference (extended)'), + self.tr('Show differences (extended)'), self.__SVNExtendedDiff) self.vcsDirMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference (URLs)'), + self.tr('Show differences (URLs)'), self.__SVNUrlDiff) self.vcsDirMenuActions.append(act) menu.addSeparator() @@ -598,7 +598,7 @@ self.tr('Merge changes'), self._VCSMerge) self.vcsDirMenuActions.append(act) act = menu.addAction( - self.tr('Conflict resolved'), self.__SVNResolve) + self.tr('Conflicts resolved'), self.__SVNResolve) self.vcsDirMenuActions.append(act) menu.addSeparator() act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp) @@ -685,16 +685,16 @@ menu.addSeparator() act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference'), self._VCSDiff) + self.tr('Show differences'), self._VCSDiff) self.vcsDirMultiMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference (extended)'), + self.tr('Show differences (extended)'), self.__SVNExtendedDiff) self.vcsDirMultiMenuActions.append(act) act = menu.addAction( UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference (URLs)'), + self.tr('Show differences (URLs)'), self.__SVNUrlDiff) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() @@ -707,7 +707,7 @@ self.tr('Merge changes'), self._VCSMerge) self.vcsDirMultiMenuActions.append(act) act = menu.addAction( - self.tr('Conflict resolved'), self.__SVNResolve) + self.tr('Conflicts resolved'), self.__SVNResolve) self.vcsDirMultiMenuActions.append(act) menu.addSeparator() act = menu.addAction(self.tr('Set Property'), self.__SVNSetProp)
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Wed Apr 02 19:08:31 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Thu Apr 03 18:53:58 2014 +0200 @@ -126,7 +126,7 @@ self.actions.append(self.svnLogBrowserAct) self.vcsDiffAct = E5Action( - self.tr('Show difference'), + self.tr('Show differences'), UI.PixmapCache.getIcon("vcsDiff.png"), self.tr('Show &difference'), 0, 0, self, 'subversion_diff') @@ -134,7 +134,7 @@ 'Show the difference of the local project to the repository' )) self.vcsDiffAct.setWhatsThis(self.tr( - """<b>Show difference</b>""" + """<b>Show differences</b>""" """<p>This shows the difference of the local project to the""" """ repository.</p>""" )) @@ -142,15 +142,15 @@ self.actions.append(self.vcsDiffAct) self.svnExtDiffAct = E5Action( - self.tr('Show difference (extended)'), + self.tr('Show differences (extended)'), UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference (extended)'), + self.tr('Show differences (extended)'), 0, 0, self, 'subversion_extendeddiff') self.svnExtDiffAct.setStatusTip(self.tr( 'Show the difference of revisions of the project to the repository' )) self.svnExtDiffAct.setWhatsThis(self.tr( - """<b>Show difference (extended)</b>""" + """<b>Show differences (extended)</b>""" """<p>This shows the difference of selectable revisions of""" """ the project.</p>""" )) @@ -158,15 +158,15 @@ self.actions.append(self.svnExtDiffAct) self.svnUrlDiffAct = E5Action( - self.tr('Show difference (URLs)'), + self.tr('Show differences (URLs)'), UI.PixmapCache.getIcon("vcsDiff.png"), - self.tr('Show difference (URLs)'), + self.tr('Show differences (URLs)'), 0, 0, self, 'subversion_urldiff') self.svnUrlDiffAct.setStatusTip(self.tr( 'Show the difference of the project between two repository URLs' )) self.svnUrlDiffAct.setWhatsThis(self.tr( - """<b>Show difference (URLs)</b>""" + """<b>Show differences (URLs)</b>""" """<p>This shows the difference of the project between""" """ two repository URLs.</p>""" ))
