Merge lp:~googol-deactivatedaccount/openlp/bug-1022837 into lp:openlp

Proposed by Andreas Preikschat
Status: Merged
Approved by: Tim Bentley
Approved revision: 2029
Merged at revision: 2030
Proposed branch: lp:~googol-deactivatedaccount/openlp/bug-1022837
Merge into: lp:openlp
Diff against target: 22 lines (+3/-3)
1 file modified
openlp/core/ui/formattingtagdialog.py (+3/-3)
To merge this branch: bzr merge lp:~googol-deactivatedaccount/openlp/bug-1022837
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Jonathan Corwin (community) Approve
Review via email: mp+114482@code.launchpad.net

Description of the change

fixed bug 1022837 (Configure Formatting Tags has inconsistent control labels)

To post a comment you must log in.
Revision history for this message
Jonathan Corwin (j-corwin) :
review: Approve
Revision history for this message
Tim Bentley (trb143) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/core/ui/formattingtagdialog.py'
2--- openlp/core/ui/formattingtagdialog.py 2012-06-22 14:14:53 +0000
3+++ openlp/core/ui/formattingtagdialog.py 2012-07-11 18:20:24 +0000
4@@ -130,15 +130,15 @@
5 translate('OpenLP.FormattingTagDialog', 'Description'))
6 self.tagLabel.setText(translate('OpenLP.FormattingTagDialog', 'Tag'))
7 self.startTagLabel.setText(
8- translate('OpenLP.FormattingTagDialog', 'Start tag'))
9+ translate('OpenLP.FormattingTagDialog', 'Start HTML'))
10 self.endTagLabel.setText(
11- translate('OpenLP.FormattingTagDialog', 'End tag'))
12+ translate('OpenLP.FormattingTagDialog', 'End HTML'))
13 self.deletePushButton.setText(UiStrings().Delete)
14 self.newPushButton.setText(UiStrings().New)
15 self.tagTableWidget.horizontalHeaderItem(0).setText(
16 translate('OpenLP.FormattingTagDialog', 'Description'))
17 self.tagTableWidget.horizontalHeaderItem(1).setText(
18- translate('OpenLP.FormattingTagDialog', 'Tag Id'))
19+ translate('OpenLP.FormattingTagDialog', 'Tag'))
20 self.tagTableWidget.horizontalHeaderItem(2).setText(
21 translate('OpenLP.FormattingTagDialog', 'Start HTML'))
22 self.tagTableWidget.horizontalHeaderItem(3).setText(