diff -r 9a21c547de5f -r a9a94491c4fd Helpviewer/Passwords/PasswordManager.py
--- a/Helpviewer/Passwords/PasswordManager.py Fri Jan 10 19:30:21 2014 +0100
+++ b/Helpviewer/Passwords/PasswordManager.py Sat Jan 11 11:55:33 2014 +0100
@@ -143,8 +143,8 @@
loginFile, self.__logins, self.__loginForms, self.__never):
E5MessageBox.critical(
None,
- self.trUtf8("Saving login data"),
- self.trUtf8(
+ self.tr("Saving login data"),
+ self.tr(
"""<p>Login data could not be saved to <b>{0}</b></p>"""
).format(loginFile))
else:
@@ -165,9 +165,9 @@
if reader.error() != QXmlStreamReader.NoError:
E5MessageBox.warning(
None,
- self.trUtf8("Loading login data"),
- self.trUtf8("""Error when loading login data on"""
- """ line {0}, column {1}:\n{2}""")
+ self.tr("Loading login data"),
+ self.tr("""Error when loading login data on"""
+ """ line {0}, column {1}:\n{2}""")
.format(reader.lineNumber(),
reader.columnNumber(),
reader.errorString()))
@@ -191,10 +191,10 @@
except IOError as err:
E5MessageBox.critical(
None,
- self.trUtf8("Loading login data"),
- self.trUtf8("""<p>Login data could not be loaded """
- """from <b>{0}</b></p>"""
- """<p>Reason: {1}</p>""")
+ self.tr("Loading login data"),
+ self.tr("""<p>Login data could not be loaded """
+ """from <b>{0}</b></p>"""
+ """<p>Reason: {1}</p>""")
.format(loginFile, str(err)))
return
@@ -216,8 +216,8 @@
if len(data) != 3:
E5MessageBox.critical(
None,
- self.trUtf8("Loading login data"),
- self.trUtf8(
+ self.tr("Loading login data"),
+ self.tr(
"""<p>Login data could not be loaded """
"""from <b>{0}</b></p>"""
"""<p>Reason: Wrong input format</p>""")
@@ -384,18 +384,18 @@
if key not in self.__loginForms:
mb = E5MessageBox.E5MessageBox(
E5MessageBox.Question,
- self.trUtf8("Save password"),
- self.trUtf8(
+ self.tr("Save password"),
+ self.tr(
"""<b>Would you like to save this password?</b><br/>"""
"""To review passwords you have saved and remove them, """
"""use the password management dialog of the Settings"""
""" menu."""),
modal=True)
neverButton = mb.addButton(
- self.trUtf8("Never for this site"),
+ self.tr("Never for this site"),
E5MessageBox.DestructiveRole)
noButton = mb.addButton(
- self.trUtf8("Not now"), E5MessageBox.RejectRole)
+ self.tr("Not now"), E5MessageBox.RejectRole)
mb.addButton(E5MessageBox.Yes)
mb.exec_()
if mb.clickedButton() == neverButton:
@@ -604,8 +604,8 @@
self.__load()
progress = E5ProgressDialog(
- self.trUtf8("Re-encoding saved passwords..."),
- None, 0, len(self.__logins), self.trUtf8("%v/%m Passwords"),
+ self.tr("Re-encoding saved passwords..."),
+ None, 0, len(self.__logins), self.tr("%v/%m Passwords"),
QApplication.activeModalWidget())
progress.setMinimumDuration(0)
count = 0
