Mercurial Repositories > eric / file diff

--- a/Helpviewer/AdBlock/AdBlockSubscription.py	Fri Jan 10 19:30:21 2014 +0100
+++ b/Helpviewer/AdBlock/AdBlockSubscription.py	Sat Jan 11 11:55:33 2014 +0100
@@ -267,8 +267,8 @@
             if not f.open(QIODevice.ReadOnly):
                 E5MessageBox.warning(
                     None,
-                    self.trUtf8("Load subscription rules"),
-                    self.trUtf8(
+                    self.tr("Load subscription rules"),
+                    self.tr(
                         """Unable to open adblock file '{0}' for reading.""")
                     .format(fileName))
             else:
@@ -277,9 +277,9 @@
                 if not header.startswith("[Adblock"):
                     E5MessageBox.warning(
                         None,
-                        self.trUtf8("Load subscription rules"),
-                        self.trUtf8("""AdBlock file '{0}' does not start"""
-                                    """ with [Adblock.""")
+                        self.tr("Load subscription rules"),
+                        self.tr("""AdBlock file '{0}' does not start"""
+                                """ with [Adblock.""")
                         .format(fileName))
                     f.close()
                     f.remove()
@@ -375,8 +375,8 @@
                 # don't show error if we try to load the default
                 E5MessageBox.warning(
                     None,
-                    self.trUtf8("Downloading subscription rules"),
-                    self.trUtf8(
+                    self.tr("Downloading subscription rules"),
+                    self.tr(
                         """<p>Subscription rules could not be"""
                         """ downloaded.</p><p>Error: {0}</p>""")
                     .format(reply.errorString()))
@@ -388,8 +388,8 @@
         if response.isEmpty():
             E5MessageBox.warning(
                 None,
-                self.trUtf8("Downloading subscription rules"),
-                self.trUtf8("""Got empty subscription rules."""))
+                self.tr("Downloading subscription rules"),
+                self.tr("""Got empty subscription rules."""))
             return
         
         fileName = self.rulesFileName()
@@ -398,8 +398,8 @@
         if not f.open(QIODevice.ReadWrite):
             E5MessageBox.warning(
                 None,
-                self.trUtf8("Downloading subscription rules"),
-                self.trUtf8(
+                self.tr("Downloading subscription rules"),
+                self.tr(
                     """Unable to open adblock file '{0}' for writing.""")
                 .file(fileName))
             return
@@ -450,8 +450,8 @@
         else:
             res = E5MessageBox.yesNo(
                 None,
-                self.trUtf8("Downloading subscription rules"),
-                self.trUtf8(
+                self.tr("Downloading subscription rules"),
+                self.tr(
                     """<p>AdBlock subscription <b>{0}</b> has a wrong"""
                     """ checksum.<br/>"""
                     """Found: {1}<br/>"""
@@ -473,8 +473,8 @@
         if not f.open(QIODevice.ReadWrite | QIODevice.Truncate):
             E5MessageBox.warning(
                 None,
-                self.trUtf8("Saving subscription rules"),
-                self.trUtf8(
+                self.tr("Saving subscription rules"),
+                self.tr(
                     """Unable to open adblock file '{0}' for writing.""")
                 .format(fileName))
             return