--- a/Helpviewer/AdBlock/AdBlockSubscription.py Fri Oct 18 23:00:41 2013 +0200 +++ b/Helpviewer/AdBlock/AdBlockSubscription.py Fri Nov 01 15:48:48 2013 +0100 @@ -267,7 +267,8 @@ f = QFile(fileName) if f.exists(): if not f.open(QIODevice.ReadOnly): - E5MessageBox.warning(None, + E5MessageBox.warning( + None, self.trUtf8("Load subscription rules"), self.trUtf8( """Unable to open adblock file '{0}' for reading.""")\ @@ -276,7 +277,8 @@ textStream = QTextStream(f) header = textStream.readLine(1024) if not header.startswith("[Adblock"): - E5MessageBox.warning(None, + E5MessageBox.warning( + None, self.trUtf8("Load subscription rules"), self.trUtf8("""AdBlock file '{0}' does not start""" """ with [Adblock.""")\ @@ -355,7 +357,8 @@ import Helpviewer.HelpWindow from Helpviewer.Network.FollowRedirectReply import FollowRedirectReply - self.__downloading = FollowRedirectReply(self.location(), + self.__downloading = FollowRedirectReply( + self.location(), Helpviewer.HelpWindow.HelpWindow.networkAccessManager()) self.__downloading.finished[()].connect(self.__rulesDownloaded) @@ -372,7 +375,8 @@ if reply.error() != QNetworkReply.NoError: if not self.__defaultSubscription: # don't show error if we try to load the default - E5MessageBox.warning(None, + E5MessageBox.warning( + None, self.trUtf8("Downloading subscription rules"), self.trUtf8( """<p>Subscription rules could not be""" @@ -384,7 +388,8 @@ return if response.isEmpty(): - E5MessageBox.warning(None, + E5MessageBox.warning( + None, self.trUtf8("Downloading subscription rules"), self.trUtf8("""Got empty subscription rules.""")) return @@ -393,7 +398,8 @@ QFile.remove(fileName) f = QFile(fileName) if not f.open(QIODevice.ReadWrite): - E5MessageBox.warning(None, + E5MessageBox.warning( + None, self.trUtf8("Downloading subscription rules"), self.trUtf8( """Unable to open adblock file '{0}' for writing.""")\ @@ -444,7 +450,8 @@ if calculatedChecksum == expectedChecksum: return True else: - res = E5MessageBox.yesNo(None, + res = E5MessageBox.yesNo( + None, self.trUtf8("Downloading subscription rules"), self.trUtf8( """<p>AdBlock subscription <b>{0}</b> has a wrong""" @@ -466,7 +473,8 @@ f = QFile(fileName) if not f.open(QIODevice.ReadWrite | QIODevice.Truncate): - E5MessageBox.warning(None, + E5MessageBox.warning( + None, self.trUtf8("Saving subscription rules"), self.trUtf8( """Unable to open adblock file '{0}' for writing.""")\