OpenLP

Merge lp:~tomasgroth/openlp/link-updates into lp:openlp

  1. link-updates
  2. Merge into trunk
Proposed by Tomas Groth
Status: Merged
Merged at revision: 2556
Proposed branch: lp:~tomasgroth/openlp/link-updates
Merge into: lp:openlp
Diff against target: 33 lines (+5/-4)
2 files modified
openlp/plugins/remotes/lib/remotetab.py (+3/-2)
openlp/plugins/songs/lib/songstab.py (+2/-2)
To merge this branch: bzr merge lp:~tomasgroth/openlp/link-updates
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Tim Bentley Approve
Review via email: mp+273317@code.launchpad.net

Description of the change

Fix string that makes it possible to translate the string.
Updated QR code pointing to android app.
Update link to google play store.

To post a comment you must log in.
Revision history for this message
Tomas Groth (tomasgroth) wrote :

The resource file should be updated on merge

Revision history for this message
Tim Bentley (trb143) :
review: Approve
Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/plugins/remotes/lib/remotetab.py'
2--- openlp/plugins/remotes/lib/remotetab.py 2015-02-14 12:35:37 +0000
3+++ openlp/plugins/remotes/lib/remotetab.py 2015-10-03 13:50:42 +0000
4@@ -177,8 +177,9 @@
5 'Show thumbnails of non-text slides in remote and stage view.'))
6 self.android_app_group_box.setTitle(translate('RemotePlugin.RemoteTab', 'Android App'))
7 self.qr_description_label.setText(
8- translate('RemotePlugin.RemoteTab', 'Scan the QR code or click <a href="https://play.google.com/store/'
9- 'apps/details?id=org.openlp.android">download</a> to install the Android app from Google Play.'))
10+ translate('RemotePlugin.RemoteTab', 'Scan the QR code or click <a href="%s">download</a> to install the '
11+ 'Android app from Google Play.') %
12+ 'https://play.google.com/store/apps/details?id=org.openlp.android2')
13 self.https_settings_group_box.setTitle(translate('RemotePlugin.RemoteTab', 'HTTPS Server'))
14 self.https_error_label.setText(
15 translate('RemotePlugin.RemoteTab', 'Could not find an SSL certificate. The HTTPS server will not be '
16
17=== modified file 'openlp/plugins/songs/lib/songstab.py'
18--- openlp/plugins/songs/lib/songstab.py 2015-01-18 13:39:21 +0000
19+++ openlp/plugins/songs/lib/songstab.py 2015-10-03 13:50:42 +0000
20@@ -79,8 +79,8 @@
21 'Import missing songs from service files'))
22 self.display_songbook_check_box.setText(translate('SongsPlugin.SongsTab', 'Display songbook in footer'))
23 self.display_copyright_check_box.setText(translate('SongsPlugin.SongsTab',
24- 'Display "%s" symbol before copyright info' %
25- SongStrings.CopyrightSymbol))
26+ 'Display "%s" symbol before copyright info') %
27+ SongStrings.CopyrightSymbol)
28
29 def on_search_as_type_check_box_changed(self, check_state):
30 self.song_search = (check_state == QtCore.Qt.Checked)
31
32=== modified file 'resources/images/android_app_qr.png'
33Binary files resources/images/android_app_qr.png 2012-08-04 14:43:44 +0000 and resources/images/android_app_qr.png 2015-10-03 13:50:42 +0000 differ