diff -r 9a21c547de5f -r a9a94491c4fd Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py --- a/Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py Fri Jan 10 19:30:21 2014 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py Sat Jan 11 11:55:33 2014 +0100 @@ -42,28 +42,28 @@ self.__activeCompleter.model().setNameFilters([]) self.typeComboBox.addItem( - self.trUtf8("Detect Automatically"), "") + self.tr("Detect Automatically"), "") self.typeComboBox.addItem( - self.trUtf8("Directory of Files"), "files") + self.tr("Directory of Files"), "files") self.typeComboBox.addItem( - self.trUtf8("Uncompressed TAR-Archive"), "tar") + self.tr("Uncompressed TAR-Archive"), "tar") self.typeComboBox.addItem( - self.trUtf8("Bzip2 compressed TAR-Archive"), "tbz2") + self.tr("Bzip2 compressed TAR-Archive"), "tbz2") self.typeComboBox.addItem( - self.trUtf8("Gzip compressed TAR-Archive"), "tgz") + self.tr("Gzip compressed TAR-Archive"), "tgz") self.typeComboBox.addItem( - self.trUtf8("Uncompressed ZIP-Archive"), "uzip") + self.tr("Uncompressed ZIP-Archive"), "uzip") self.typeComboBox.addItem( - self.trUtf8("Compressed ZIP-Archive"), "zip") + self.tr("Compressed ZIP-Archive"), "zip") self.__unixFileFilters = [ - self.trUtf8("Bzip2 compressed TAR-Archive (*.tar.bz2)"), - self.trUtf8("Gzip compressed TAR-Archive (*.tar.gz)"), - self.trUtf8("Uncompressed TAR-Archive (*.tar)"), + self.tr("Bzip2 compressed TAR-Archive (*.tar.bz2)"), + self.tr("Gzip compressed TAR-Archive (*.tar.gz)"), + self.tr("Uncompressed TAR-Archive (*.tar)"), ] self.__windowsFileFilters = [ - self.trUtf8("Compressed ZIP-Archive (*.zip)"), - self.trUtf8("Uncompressed ZIP-Archive (*.uzip)") + self.tr("Compressed ZIP-Archive (*.zip)"), + self.tr("Uncompressed ZIP-Archive (*.uzip)") ] if Utilities.isWindowsPlatform(): self.__fileFilters = ";;".join( @@ -71,7 +71,7 @@ else: self.__fileFilters = ";;".join( self.__unixFileFilters + self.__windowsFileFilters) - self.__fileFilters += ";;" + self.trUtf8("All Files (*)") + self.__fileFilters += ";;" + self.tr("All Files (*)") self.__typeFilters = { "tar": ["*.tar"], @@ -111,13 +111,13 @@ if type_ == "files": archive = E5FileDialog.getExistingDirectory( self, - self.trUtf8("Select Archive Directory"), + self.tr("Select Archive Directory"), archive, E5FileDialog.Options(E5FileDialog.ShowDirsOnly)) else: archive, selectedFilter = E5FileDialog.getSaveFileNameAndFilter( self, - self.trUtf8("Select Archive File"), + self.tr("Select Archive File"), archive, self.__fileFilters, None,