← Back to branch summary

~suutari-olli/openlp/escape-fixes-1294111-1497637

« back to all changes in this revision

Viewing changes to openlp/core/common/uistrings.py

  • Committer: suutari-olli
  • Date: 2016-01-07 02:53:59 UTC
  • mfrom: (2557.2.31 openlp)
  • Revision ID: suutari.olli@gmail.com-20160107025359-q2feybbwxaoihqxr
Merge to trunk on 1/7/2015.

I noticed this branch also seems to be fixing this bug:
https://bugs.launchpad.net/openlp/+bug/1531691

However, escape item still remains buggy with problems related to resuming
video and presentations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
openlp/core/common/uistrings.py
4
4
###############################################################################
5
5
# OpenLP - Open Source Lyrics Projection                                      #
6
6
# --------------------------------------------------------------------------- #
7
 
# Copyright (c) 2008-2015 OpenLP Developers                                   #
 
7
# Copyright (c) 2008-2016 OpenLP Developers                                   #
8
8
# --------------------------------------------------------------------------- #
9
9
# This program is free software; you can redistribute it and/or modify it     #
10
10
# under the terms of the GNU General Public License as published by the Free  #
108
108
        self.NFSp = translate('OpenLP.Ui', 'No Files Selected', 'Plural')
109
109
        self.NISs = translate('OpenLP.Ui', 'No Item Selected', 'Singular')
110
110
        self.NISp = translate('OpenLP.Ui', 'No Items Selected', 'Plural')
111
 
        self.OLPV2 = translate('OpenLP.Ui', 'OpenLP 2')
112
 
        self.OLPV2x = translate('OpenLP.Ui', 'OpenLP 2.2')
 
111
        self.OLP = translate('OpenLP.Ui', 'OpenLP')
 
112
        self.OLPV2 = "%s %s" % (self.OLP, "2")
 
113
        self.OLPV2x = "%s %s" % (self.OLP, "2.4")
113
114
        self.OpenLPStart = translate('OpenLP.Ui', 'OpenLP is already running. Do you wish to continue?')
114
115
        self.OpenService = translate('OpenLP.Ui', 'Open service.')
115
116
        self.PlaySlidesInLoop = translate('OpenLP.Ui', 'Play Slides in Loop')