diff -r 9a21c547de5f -r a9a94491c4fd Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Fri Jan 10 19:30:21 2014 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py Sat Jan 11 11:55:33 2014 +0100
@@ -160,8 +160,8 @@
else:
E5MessageBox.critical(
self,
- self.trUtf8("Subversion Diff"),
- self.trUtf8("""There is no temporary directory available."""))
+ self.tr("Subversion Diff"),
+ self.tr("""There is no temporary directory available."""))
return
tmpdir = os.path.join(tmpdir, 'svn_tmp')
@@ -202,7 +202,7 @@
dname += "/"
for name in fnames:
self.__showError(
- self.trUtf8("Processing file '{0}'...\n").format(name))
+ self.tr("Processing file '{0}'...\n").format(name))
if urls is not None:
url1 = "{0}/{1}{2}".format(urls[0], dname, name)
url2 = "{0}/{1}{2}".format(urls[1], dname, name)
@@ -258,7 +258,7 @@
if self.paras == 0:
self.contents.insertPlainText(
- self.trUtf8('There is no difference.'))
+ self.tr('There is no difference.'))
return
self.buttonBox.button(QDialogButtonBox.Save).setEnabled(True)
@@ -327,8 +327,8 @@
self.contents.setTextCursor(tc)
self.contents.ensureCursorVisible()
- self.filesCombo.addItem(self.trUtf8("<Start>"), 0)
- self.filesCombo.addItem(self.trUtf8("<End>"), -1)
+ self.filesCombo.addItem(self.tr("<Start>"), 0)
+ self.filesCombo.addItem(self.tr("<End>"), -1)
for oldFile, newFile, pos in sorted(self.__fileSeparators):
if oldFile != newFile:
self.filesCombo.addItem(
@@ -407,9 +407,9 @@
fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
self,
- self.trUtf8("Save Diff"),
+ self.tr("Save Diff"),
fname,
- self.trUtf8("Patch Files (*.diff)"),
+ self.tr("Patch Files (*.diff)"),
None,
E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite))
@@ -424,9 +424,9 @@
if QFileInfo(fname).exists():
res = E5MessageBox.yesNo(
self,
- self.trUtf8("Save Diff"),
- self.trUtf8("<p>The patch file <b>{0}</b> already exists."
- " Overwrite it?</p>").format(fname),
+ self.tr("Save Diff"),
+ self.tr("<p>The patch file <b>{0}</b> already exists."
+ " Overwrite it?</p>").format(fname),
icon=E5MessageBox.Warning)
if not res:
return
@@ -439,8 +439,8 @@
f.close()
except IOError as why:
E5MessageBox.critical(
- self, self.trUtf8('Save Diff'),
- self.trUtf8(
+ self, self.tr('Save Diff'),
+ self.tr(
'<p>The patch file <b>{0}</b> could not be saved.'
'<br>Reason: {1}</p>')
.format(fname, str(why)))
