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

[Tomas Groth]

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

[Tomas Groth (tomasgroth)]

The resource file should be updated on merge

[Tim Bentley (trb143)]

review: Approve

[Raoul Snyman (raoul-snyman)]

review: Approve

=== modified file 'openlp/plugins/remotes/lib/remotetab.py'
--- openlp/plugins/remotes/lib/remotetab.py	2015-02-14 12:35:37 +0000
+++ openlp/plugins/remotes/lib/remotetab.py	2015-10-03 13:50:42 +0000
@@ -177,8 +177,9 @@
                                                     'Show thumbnails of non-text slides in remote and stage view.'))
         self.android_app_group_box.setTitle(translate('RemotePlugin.RemoteTab', 'Android App'))
         self.qr_description_label.setText(
-            translate('RemotePlugin.RemoteTab', 'Scan the QR code or click <a href="https://play.google.com/store/'
-                      'apps/details?id=org.openlp.android">download</a> to install the Android app from Google Play.'))
+            translate('RemotePlugin.RemoteTab', 'Scan the QR code or click <a href="%s">download</a> to install the '
+                                                'Android app from Google Play.') %
+                                          'https://play.google.com/store/apps/details?id=org.openlp.android2') 
         self.https_settings_group_box.setTitle(translate('RemotePlugin.RemoteTab', 'HTTPS Server'))
         self.https_error_label.setText(
             translate('RemotePlugin.RemoteTab', 'Could not find an SSL certificate. The HTTPS server will not be '
 
=== modified file 'openlp/plugins/songs/lib/songstab.py'
--- openlp/plugins/songs/lib/songstab.py	2015-01-18 13:39:21 +0000
+++ openlp/plugins/songs/lib/songstab.py	2015-10-03 13:50:42 +0000
@@ -79,8 +79,8 @@
                                                           'Import missing songs from service files'))
         self.display_songbook_check_box.setText(translate('SongsPlugin.SongsTab', 'Display songbook in footer'))
         self.display_copyright_check_box.setText(translate('SongsPlugin.SongsTab',
-                                                           'Display "%s" symbol before copyright info' %
-                                                           SongStrings.CopyrightSymbol))
+                                                           'Display "%s" symbol before copyright info') %
+                                                           SongStrings.CopyrightSymbol)
 
     def on_search_as_type_check_box_changed(self, check_state):
         self.song_search = (check_state == QtCore.Qt.Checked)
 
=== modified file 'resources/images/android_app_qr.png'
 Binary 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