OpenLP

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

  1. bug-1022837
  2. Merge into trunk
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
=== modified file 'openlp/core/ui/formattingtagdialog.py'
--- openlp/core/ui/formattingtagdialog.py 2012-06-22 14:14:53 +0000
+++ openlp/core/ui/formattingtagdialog.py 2012-07-11 18:20:24 +0000
@@ -130,15 +130,15 @@
130 translate('OpenLP.FormattingTagDialog', 'Description'))130 translate('OpenLP.FormattingTagDialog', 'Description'))
131 self.tagLabel.setText(translate('OpenLP.FormattingTagDialog', 'Tag'))131 self.tagLabel.setText(translate('OpenLP.FormattingTagDialog', 'Tag'))
132 self.startTagLabel.setText(132 self.startTagLabel.setText(
133 translate('OpenLP.FormattingTagDialog', 'Start tag'))133 translate('OpenLP.FormattingTagDialog', 'Start HTML'))
134 self.endTagLabel.setText(134 self.endTagLabel.setText(
135 translate('OpenLP.FormattingTagDialog', 'End tag'))135 translate('OpenLP.FormattingTagDialog', 'End HTML'))
136 self.deletePushButton.setText(UiStrings().Delete)136 self.deletePushButton.setText(UiStrings().Delete)
137 self.newPushButton.setText(UiStrings().New)137 self.newPushButton.setText(UiStrings().New)
138 self.tagTableWidget.horizontalHeaderItem(0).setText(138 self.tagTableWidget.horizontalHeaderItem(0).setText(
139 translate('OpenLP.FormattingTagDialog', 'Description'))139 translate('OpenLP.FormattingTagDialog', 'Description'))
140 self.tagTableWidget.horizontalHeaderItem(1).setText(140 self.tagTableWidget.horizontalHeaderItem(1).setText(
141 translate('OpenLP.FormattingTagDialog', 'Tag Id'))141 translate('OpenLP.FormattingTagDialog', 'Tag'))
142 self.tagTableWidget.horizontalHeaderItem(2).setText(142 self.tagTableWidget.horizontalHeaderItem(2).setText(
143 translate('OpenLP.FormattingTagDialog', 'Start HTML'))143 translate('OpenLP.FormattingTagDialog', 'Start HTML'))
144 self.tagTableWidget.horizontalHeaderItem(3).setText(144 self.tagTableWidget.horizontalHeaderItem(3).setText(