raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Make 2 texts translatable.

Browse Source 
Remove unneeded quotes from commit message in the merge-script.

bzr-revno: 2558
This commit is contained in:
second@tgc.dk 2015-10-13 11:30:40 +01:00 committed by Tomas Groth
commit 924d0f8b29
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openlp/core/ui/projector/manager.py
View File

@ -473,8 +473,9 @@ class ProjectorManager(OpenLPMixin, RegistryMixin, QWidget, Ui_ProjectorManager,
return return
projector = list_item.data(QtCore.Qt.UserRole) projector = list_item.data(QtCore.Qt.UserRole)
msg = QtGui.QMessageBox() msg = QtGui.QMessageBox()
msg.setText('Delete projector (%s) %s?' % (projector.link.ip, projector.link.name)) msg.setText(translate('OpenLP.ProjectorManager', 'Delete projector (%s) %s?') % (projector.link.ip,
msg.setInformativeText('Are you sure you want to delete this projector?') projector.link.name))
msg.setInformativeText(translate('OpenLP.ProjectorManager', 'Are you sure you want to delete this projector?'))
msg.setStandardButtons(msg.Cancel | msg.Ok) msg.setStandardButtons(msg.Cancel | msg.Ok)
msg.setDefaultButton(msg.Cancel) msg.setDefaultButton(msg.Cancel)
ans = msg.exec_() ans = msg.exec_()

2
scripts/lp-merge.py
View File

@ -129,7 +129,7 @@ for bug in bugs:
commit_command.append('lp:' + bug) commit_command.append('lp:' + bug)
commit_command.append('-m') commit_command.append('-m')
commit_command.append('"' + commit_message + '"') commit_command.append(commit_message)
commit_command.append('--author') commit_command.append('--author')
commit_command.append('"' + author_email + '"') commit_command.append('"' + author_email + '"')