Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py	Fri Jan 10 19:30:21 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py	Sat Jan 11 11:55:33 2014 +0100
@@ -32,14 +32,14 @@
         Public method to generate the action objects.
         """
         self.hgRebaseAct = E5Action(
-            self.trUtf8('Rebase Changesets'),
+            self.tr('Rebase Changesets'),
             UI.PixmapCache.getIcon("vcsRebase.png"),
-            self.trUtf8('Rebase Changesets'),
+            self.tr('Rebase Changesets'),
             0, 0, self, 'mercurial_rebase')
-        self.hgRebaseAct.setStatusTip(self.trUtf8(
+        self.hgRebaseAct.setStatusTip(self.tr(
             'Rebase changesets to another branch'
         ))
-        self.hgRebaseAct.setWhatsThis(self.trUtf8(
+        self.hgRebaseAct.setWhatsThis(self.tr(
             """<b>Rebase Changesets</b>"""
             """<p>This rebases changesets to another branch.</p>"""
         ))
@@ -47,13 +47,13 @@
         self.actions.append(self.hgRebaseAct)
         
         self.hgRebaseContinueAct = E5Action(
-            self.trUtf8('Continue Rebase Session'),
-            self.trUtf8('Continue Rebase Session'),
+            self.tr('Continue Rebase Session'),
+            self.tr('Continue Rebase Session'),
             0, 0, self, 'mercurial_rebase_continue')
-        self.hgRebaseContinueAct.setStatusTip(self.trUtf8(
+        self.hgRebaseContinueAct.setStatusTip(self.tr(
             'Continue the last rebase session after repair'
         ))
-        self.hgRebaseContinueAct.setWhatsThis(self.trUtf8(
+        self.hgRebaseContinueAct.setWhatsThis(self.tr(
             """<b>Continue Rebase Session</b>"""
             """<p>This continues the last rebase session after repair.</p>"""
         ))
@@ -61,13 +61,13 @@
         self.actions.append(self.hgRebaseContinueAct)
         
         self.hgRebaseAbortAct = E5Action(
-            self.trUtf8('Abort Rebase Session'),
-            self.trUtf8('Abort Rebase Session'),
+            self.tr('Abort Rebase Session'),
+            self.tr('Abort Rebase Session'),
             0, 0, self, 'mercurial_rebase_abort')
-        self.hgRebaseAbortAct.setStatusTip(self.trUtf8(
+        self.hgRebaseAbortAct.setStatusTip(self.tr(
             'Abort the last rebase session'
         ))
-        self.hgRebaseAbortAct.setWhatsThis(self.trUtf8(
+        self.hgRebaseAbortAct.setWhatsThis(self.tr(
             """<b>Abort Rebase Session</b>"""
             """<p>This aborts the last rebase session.</p>"""
         ))
@@ -97,7 +97,7 @@
         
         @return title of the menu (string)
         """
-        return self.trUtf8("Rebase")
+        return self.tr("Rebase")
     
     def __hgRebase(self):
         """
@@ -108,8 +108,8 @@
         if shouldReopen:
             res = E5MessageBox.yesNo(
                 None,
-                self.trUtf8("Rebase Changesets"),
-                self.trUtf8("""The project should be reread. Do this now?"""),
+                self.tr("Rebase Changesets"),
+                self.tr("""The project should be reread. Do this now?"""),
                 yesDefault=True)
             if res:
                 self.project.reopenProject()
@@ -123,8 +123,8 @@
         if shouldReopen:
             res = E5MessageBox.yesNo(
                 None,
-                self.trUtf8("Rebase Changesets (Continue)"),
-                self.trUtf8("""The project should be reread. Do this now?"""),
+                self.tr("Rebase Changesets (Continue)"),
+                self.tr("""The project should be reread. Do this now?"""),
                 yesDefault=True)
             if res:
                 self.project.reopenProject()
@@ -138,8 +138,8 @@
         if shouldReopen:
             res = E5MessageBox.yesNo(
                 None,
-                self.trUtf8("Rebase Changesets (Abort)"),
-                self.trUtf8("""The project should be reread. Do this now?"""),
+                self.tr("Rebase Changesets (Abort)"),
+                self.tr("""The project should be reread. Do this now?"""),
                 yesDefault=True)
             if res:
                 self.project.reopenProject()