diff --git a/openlp/core/common/settings.py b/openlp/core/common/settings.py index 9584728cc..41c3d4d0f 100644 --- a/openlp/core/common/settings.py +++ b/openlp/core/common/settings.py @@ -323,8 +323,8 @@ class Settings(QtCore.QSettings): __file_path__ = '' __obsolete_settings__ = [ # Changed during 2.2.x development. - #('advanced/stylesheet fix', '', []), - #('general/recent files', 'core/recent files', [(recent_files_conv, None)]), + # ('advanced/stylesheet fix', '', []), + # ('general/recent files', 'core/recent files', [(recent_files_conv, None)]), ('songs/search as type', 'advanced/search as type', []) ] diff --git a/openlp/core/common/uistrings.py b/openlp/core/common/uistrings.py index 8add1a35c..5b230baa6 100644 --- a/openlp/core/common/uistrings.py +++ b/openlp/core/common/uistrings.py @@ -108,8 +108,9 @@ class UiStrings(object): self.NFSp = translate('OpenLP.Ui', 'No Files Selected', 'Plural') self.NISs = translate('OpenLP.Ui', 'No Item Selected', 'Singular') self.NISp = translate('OpenLP.Ui', 'No Items Selected', 'Plural') - self.OLPV2 = translate('OpenLP.Ui', 'OpenLP 2') - self.OLPV2x = translate('OpenLP.Ui', 'OpenLP 2.2') + self.OLP = translate('OpenLP.Ui', 'OpenLP') + self.OLPV2 = "%s %s" % (self.OLP, "2") + self.OLPV2x = "%s %s" % (self.OLP, "2.4") self.OpenLPStart = translate('OpenLP.Ui', 'OpenLP is already running. Do you wish to continue?') self.OpenService = translate('OpenLP.Ui', 'Open service.') self.PlaySlidesInLoop = translate('OpenLP.Ui', 'Play Slides in Loop')