openlp-core team mailing list archive

[Tomas Groth <tomasgroth@xxxxxxxx>]

Tomas Groth has proposed merging lp:~tomasgroth/openlp/text-fix into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~tomasgroth/openlp/text-fix/+merge/274134

Make 2 texts translatable.
Remove unneeded quotes from commit message in the merge-script.

-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~tomasgroth/openlp/text-fix into lp:openlp.

=== modified file 'openlp/core/ui/projector/manager.py'
--- openlp/core/ui/projector/manager.py	2015-02-18 22:21:39 +0000
+++ openlp/core/ui/projector/manager.py	2015-10-12 13:14:37 +0000
@@ -473,8 +473,9 @@
             return
         projector = list_item.data(QtCore.Qt.UserRole)
         msg = QtGui.QMessageBox()
-        msg.setText('Delete projector (%s) %s?' % (projector.link.ip, projector.link.name))
-        msg.setInformativeText('Are you sure you want to delete this projector?')
+        msg.setText(translate('OpenLP.ProjectorManager', 'Delete projector (%s) %s?') % (projector.link.ip,
+                                                                                         projector.link.name))
+        msg.setInformativeText(translate('OpenLP.ProjectorManager', 'Are you sure you want to delete this projector?'))
         msg.setStandardButtons(msg.Cancel | msg.Ok)
         msg.setDefaultButton(msg.Cancel)
         ans = msg.exec_()

=== modified file 'scripts/lp-merge.py'
--- scripts/lp-merge.py	2015-10-10 20:53:36 +0000
+++ scripts/lp-merge.py	2015-10-12 13:14:37 +0000
@@ -129,7 +129,7 @@
     commit_command.append('lp:' + bug)
 
 commit_command.append('-m')
-commit_command.append('"' + commit_message + '"')
+commit_command.append(commit_message)
 
 commit_command.append('--author')
 commit_command.append('"' + author_email + '"')