OpenLP

Merge lp:~suutari-olli/openlp/ui-messages-part-1 into lp:openlp

  1. ui-messages-part-1
  2. Merge into trunk
Proposed by Azaziah
Status: Superseded
Proposed branch: lp:~suutari-olli/openlp/ui-messages-part-1
Merge into: lp:openlp
Diff against target: 472 lines (+90/-83)
17 files modified
openlp/core/ui/advancedtab.py (+4/-4)
openlp/core/ui/exceptiondialog.py (+13/-8)
openlp/core/ui/exceptionform.py (+1/-1)
openlp/core/ui/mainwindow.py (+42/-39)
openlp/core/ui/media/playertab.py (+1/-1)
openlp/plugins/bibles/lib/biblestab.py (+4/-4)
openlp/plugins/media/lib/mediaitem.py (+1/-1)
openlp/plugins/media/lib/mediatab.py (+1/-1)
openlp/plugins/presentations/lib/powerpointcontroller.py (+2/-2)
openlp/plugins/presentations/lib/pptviewcontroller.py (+1/-1)
openlp/plugins/presentations/lib/presentationtab.py (+4/-4)
openlp/plugins/presentations/presentationplugin.py (+2/-2)
openlp/plugins/remotes/lib/httprouter.py (+4/-5)
tests/functional/openlp_core_ui/test_mainwindow.py (+7/-7)
tests/functional/openlp_plugins/presentations/test_mediaitem.py (+1/-1)
tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py (+1/-1)
tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py (+1/-1)
To merge this branch: bzr merge lp:~suutari-olli/openlp/ui-messages-part-1
Reviewer Review Type Date Requested Status
Tim Bentley Needs Fixing
Review via email: mp+291447@code.launchpad.net

This proposal has been superseded by a proposal from 2016-04-12.

Description of the change

This branch includes the following UI string changes:
- Media Manager, Projector Manager, Service Manager, Theme Manager,
   Preview Panel and Live Panel have been renamed to: ”Library,
   Projectors, Service, Themes, Preview and Live."
- Tooltips/texts for these have been changed.
- Removed version from window title
- Removed version from web remote page window names.
- Re-did the trace back message.
- Some other changes

In "Configurate OpenLP":
- Changed typing for all labels to lowercase
- Removed "Manager" from some strings since it's no longer used.
- Added dots to various tooltips / descriptions.
- In advanced tab: Number of recent files to display:
  has been changed to Number of recent Service files to display:

Do note that Jenkins is currently broken due to the crosswalk Bible test.
lp:~suutari-olli/openlp/ui-messages-part-1 (revision 2636)
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-01-Pull/1413/
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-02-Functional-Tests/1331/
[←[1;31mFAILURE←[1;m] https://ci.openlp.io/job/Branch-03-Interface-Tests/1270/
Stopping after failure

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

Not convinced with the removal of the version - see email.

Some improvements in the text as some changes can be made even clearer.

review: Needs Fixing
lp:~suutari-olli/openlp/ui-messages-part-1 updated
2637. By Azaziah

- Re-did some of the changes.
- Fixed Powerpoint to PowerPoint in presentation controllers and one error.

2638. By Azaziah

- Fixed PPT name tests by changing Powerpoint into PowerPoint
- Replaced resources.py with trunk version.

2639. By Azaziah

Added back the last missing *

2640. By Azaziah

- Changed: Clicking on selected slide in live advances to the next effect to Clicking on current slide in live advances to the next effect

Revision history for this message
Azaziah (suutari-olli) wrote :

Thank you for the review, I've replied to the comments and made some changes.

lp:~suutari-olli/openlp/ui-messages-part-1 updated
2641. By Azaziah

- Reverted the Powerpoint > PowerPoint changes.

2642. By Azaziah

Merged trunk on 13.4.16

2643. By Azaziah

- Capitalized references to plugin/panel names in settings. (Live etc.)
- Added: self.BackgroundColorColon = translate('OpenLP.Ui', 'Background color:') to uistrings.
  This is now used in players tab, alerts tab and images tab.
- Added space before "s" and "pt" units.

2644. By Azaziah

Splitted mail adress away expection error text, now inserting it with %s

2645. By Azaziah

Commiting for merging trunk, some new changes.

2646. By Azaziah

- Merged trunk

2647. By Azaziah

Lowercapped some settings.

2648. By Azaziah

Lowercapped bunch of stuff, splitted expection error

2649. By Azaziah

- Changes based on comments by TRB143

2650. By Azaziah

- Pep8 fixes

2651. By Azaziah

- Merged trunk on 18.5.2016 20:57

2652. By Azaziah

- Changed stuff based on comments by TRB143.

2653. By Azaziah

- Merged trunk on 24.7.16
- Added superflys startup traceback fix to my code
- Resolved conflicts

2654. By Azaziah

- Changed Remote web page titles from OpenLP | x to x | OpenLP

2655. By Azaziah

- Merged trunk on 2.8.16

2656. By Azaziah

- Changed stuff based on suggestions by superfly

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/core/ui/advancedtab.py'
2--- openlp/core/ui/advancedtab.py 2016-04-05 17:30:20 +0000
3+++ openlp/core/ui/advancedtab.py 2016-04-12 12:59:28 +0000
4@@ -273,15 +273,15 @@
5 self.tab_title_visible = UiStrings().Advanced
6 self.ui_group_box.setTitle(translate('OpenLP.AdvancedTab', 'UI Settings'))
7 self.data_directory_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Data Location'))
8- self.recent_label.setText(translate('OpenLP.AdvancedTab', 'Number of recent files to display:'))
9+ self.recent_label.setText(translate('OpenLP.AdvancedTab', 'Number of recent service files to display:'))
10 self.media_plugin_check_box.setText(translate('OpenLP.AdvancedTab',
11- 'Remember active media manager tab on startup'))
12+ 'Open the last used library category on startup'))
13 self.double_click_live_check_box.setText(translate('OpenLP.AdvancedTab',
14 'Double-click to send items straight to live'))
15 self.single_click_preview_check_box.setText(translate('OpenLP.AdvancedTab',
16- 'Preview items when clicked in Media Manager'))
17+ 'Preview items when clicked in library'))
18 self.single_click_service_preview_check_box.setText(translate('OpenLP.AdvancedTab',
19- 'Preview items when clicked in Service Manager'))
20+ 'Preview items when clicked in service'))
21 self.expand_service_item_check_box.setText(translate('OpenLP.AdvancedTab',
22 'Expand new service items on creation'))
23 self.slide_max_height_label.setText(translate('OpenLP.AdvancedTab',
24
25=== modified file 'openlp/core/ui/exceptiondialog.py'
26--- openlp/core/ui/exceptiondialog.py 2015-12-31 22:46:06 +0000
27+++ openlp/core/ui/exceptiondialog.py 2016-04-12 12:59:28 +0000
28@@ -43,6 +43,8 @@
29 self.exception_layout.setObjectName('exception_layout')
30 self.message_layout = QtWidgets.QHBoxLayout()
31 self.message_layout.setObjectName('messageLayout')
32+ # Set margin to make the box a bit wider so the traceback is easier to read. (left, top, right, bottom)
33+ self.message_layout.setContentsMargins(0, 0, 50, 0)
34 self.message_layout.addSpacing(12)
35 self.bug_label = QtWidgets.QLabel(exception_dialog)
36 self.bug_label.setPixmap(QtGui.QPixmap(':/graphics/exception.png'))
37@@ -90,15 +92,18 @@
38 """
39 exception_dialog.setWindowTitle(translate('OpenLP.ExceptionDialog', 'Error Occurred'))
40 self.description_explanation.setText(
41- translate('OpenLP.ExceptionDialog', 'Please enter a description of what you were doing to cause this error.'
42- ' If possible, write in English.'
43- '\n(Minimum 20 characters)'))
44+ translate('OpenLP.ExceptionDialog', '<strong>Please describe what you were trying to do.</strong> '
45+ '&nbsp;If possible, write in English.'))
46 self.message_label.setText(
47- translate('OpenLP.ExceptionDialog', 'Oops! OpenLP hit a problem, and couldn\'t recover. The text in the '
48- 'box below contains information that might be helpful to the OpenLP '
49- 'developers, so please e-mail it to bugs@openlp.org, along with a '
50- 'detailed description of what you were doing when the problem '
51- 'occurred. Also attach any files that triggered the problem.'))
52+ translate('OpenLP.ExceptionDialog', '<strong>Oops, OpenLP hit a problem '
53+ 'and couldn\'t recover!</strong> <br><br>'
54+ '<strong>You can help </strong> OpenLP developers to fix this by<br>'
55+ 'sending them a <strong>bug report</strong> '
56+ 'to <a href="mailto:bugs@openlp.org"> bugs@openlp.org </a> <br> <br>'
57+ '<strong>No email app? </strong> You can <strong>save</strong> this '
58+ 'information to a <strong>file</strong> and<br>'
59+ 'send it from your <strong>mail on browser</strong> via an <strong>attachement.</strong><br><br>'
60+ '<strong>Thank you<strong> for being part of making OpenLP better!'))
61 self.send_report_button.setText(translate('OpenLP.ExceptionDialog', 'Send E-Mail'))
62 self.save_report_button.setText(translate('OpenLP.ExceptionDialog', 'Save to File'))
63 self.attach_tile_button.setText(translate('OpenLP.ExceptionDialog', 'Attach File'))
64
65=== modified file 'openlp/core/ui/exceptionform.py'
66--- openlp/core/ui/exceptionform.py 2016-04-04 19:53:54 +0000
67+++ openlp/core/ui/exceptionform.py 2016-04-12 12:59:28 +0000
68@@ -199,7 +199,7 @@
69 else:
70 self.__button_state(False)
71 self.description_word_count.setText(
72- translate('OpenLP.ExceptionDialog', 'Description characters to enter : %s') % count)
73+ translate('OpenLP.ExceptionDialog', '%s Characters from the minimum description remaining.') % count)
74
75 def on_attach_file_button_clicked(self):
76 """
77
78=== modified file 'openlp/core/ui/mainwindow.py'
79--- openlp/core/ui/mainwindow.py 2016-04-04 19:53:54 +0000
80+++ openlp/core/ui/mainwindow.py 2016-04-12 12:59:28 +0000
81@@ -385,21 +385,21 @@
82 """
83 Set up the translation system
84 """
85- main_window.setWindowTitle(UiStrings().OLPV2x)
86+ main_window.setWindowTitle(UiStrings().OLP)
87 self.file_menu.setTitle(translate('OpenLP.MainWindow', '&File'))
88 self.file_import_menu.setTitle(translate('OpenLP.MainWindow', '&Import'))
89 self.file_export_menu.setTitle(translate('OpenLP.MainWindow', '&Export'))
90 self.recent_files_menu.setTitle(translate('OpenLP.MainWindow', '&Recent Services'))
91 self.view_menu.setTitle(translate('OpenLP.MainWindow', '&View'))
92- self.view_mode_menu.setTitle(translate('OpenLP.MainWindow', 'M&ode'))
93+ self.view_mode_menu.setTitle(translate('OpenLP.MainWindow', '&Layout Presets'))
94 self.tools_menu.setTitle(translate('OpenLP.MainWindow', '&Tools'))
95 self.settings_menu.setTitle(translate('OpenLP.MainWindow', '&Settings'))
96 self.settings_language_menu.setTitle(translate('OpenLP.MainWindow', '&Language'))
97 self.help_menu.setTitle(translate('OpenLP.MainWindow', '&Help'))
98 self.media_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Library'))
99- self.service_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Service Manager'))
100- self.theme_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Theme Manager'))
101- self.projector_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Projector Manager'))
102+ self.service_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Service'))
103+ self.theme_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Themes'))
104+ self.projector_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Projectors'))
105 self.file_new_item.setText(translate('OpenLP.MainWindow', '&New Service'))
106 self.file_new_item.setToolTip(UiStrings().NewService)
107 self.file_new_item.setStatusTip(UiStrings().CreateService)
108@@ -416,7 +416,7 @@
109 self.print_service_order_item.setText(UiStrings().PrintService)
110 self.print_service_order_item.setStatusTip(translate('OpenLP.MainWindow', 'Print the current service.'))
111 self.file_exit_item.setText(translate('OpenLP.MainWindow', 'E&xit'))
112- self.file_exit_item.setStatusTip(translate('OpenLP.MainWindow', 'Quit OpenLP'))
113+ self.file_exit_item.setStatusTip(translate('OpenLP.MainWindow', 'Close OpenLP - Shut down the program.'))
114 self.import_theme_item.setText(translate('OpenLP.MainWindow', '&Theme'))
115 self.import_language_item.setText(translate('OpenLP.MainWindow', '&Language'))
116 self.export_theme_item.setText(translate('OpenLP.MainWindow', '&Theme'))
117@@ -425,41 +425,42 @@
118 self.formatting_tag_item.setText(translate('OpenLP.MainWindow', 'Configure &Formatting Tags...'))
119 self.settings_configure_item.setText(translate('OpenLP.MainWindow', '&Configure OpenLP...'))
120 self.settings_export_item.setStatusTip(
121- translate('OpenLP.MainWindow', 'Export OpenLP settings to a specified *.config file'))
122+ translate('OpenLP.MainWindow', 'Export settings to a *.config file.'))
123 self.settings_export_item.setText(translate('OpenLP.MainWindow', 'Settings'))
124 self.settings_import_item.setStatusTip(
125- translate('OpenLP.MainWindow', 'Import OpenLP settings from a specified *.config file previously '
126- 'exported on this or another machine'))
127+ translate('OpenLP.MainWindow', 'Import OpenLP settings from a *.config file previously exported from '
128+ 'this or an another machine.'))
129 self.settings_import_item.setText(translate('OpenLP.MainWindow', 'Settings'))
130- self.view_projector_manager_item.setText(translate('OPenLP.MainWindow', '&Projector Manager'))
131- self.view_projector_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Projector Manager'))
132+ self.view_projector_manager_item.setText(translate('OPenLP.MainWindow', '&Projectors'))
133+ self.view_projector_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Projectors.'))
134 self.view_projector_manager_item.setStatusTip(translate('OpenLP.MainWindow',
135- 'Toggle the visibility of the Projector Manager'))
136- self.view_media_manager_item.setText(translate('OpenLP.MainWindow', '&Media Manager'))
137- self.view_media_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Media Manager'))
138+ 'Toggle the visibility of the Projectors.'))
139+ self.view_media_manager_item.setText(translate('OpenLP.MainWindow', 'L&ibrary'))
140+ self.view_media_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show the Library.'))
141 self.view_media_manager_item.setStatusTip(translate('OpenLP.MainWindow',
142- 'Toggle the visibility of the media manager.'))
143- self.view_theme_manager_item.setText(translate('OpenLP.MainWindow', '&Theme Manager'))
144- self.view_theme_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Theme Manager'))
145+ 'Toggle the visibility of the Library.'))
146+ self.view_theme_manager_item.setText(translate('OpenLP.MainWindow', '&Themes'))
147+ self.view_theme_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Themes'))
148 self.view_theme_manager_item.setStatusTip(translate('OpenLP.MainWindow',
149- 'Toggle the visibility of the theme manager.'))
150- self.view_service_manager_item.setText(translate('OpenLP.MainWindow', '&Service Manager'))
151- self.view_service_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Service Manager'))
152+ 'Toggle the visibility of the Themes.'))
153+ self.view_service_manager_item.setText(translate('OpenLP.MainWindow', '&Service'))
154+ self.view_service_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Service.'))
155 self.view_service_manager_item.setStatusTip(translate('OpenLP.MainWindow',
156- 'Toggle the visibility of the service manager.'))
157- self.view_preview_panel.setText(translate('OpenLP.MainWindow', '&Preview Panel'))
158- self.view_preview_panel.setToolTip(translate('OpenLP.MainWindow', 'Toggle Preview Panel'))
159+ 'Toggle the visibility of the Service.'))
160+ self.view_preview_panel.setText(translate('OpenLP.MainWindow', '&Preview'))
161+ self.view_preview_panel.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Preview.'))
162 self.view_preview_panel.setStatusTip(
163- translate('OpenLP.MainWindow', 'Toggle the visibility of the preview panel.'))
164- self.view_live_panel.setText(translate('OpenLP.MainWindow', '&Live Panel'))
165- self.view_live_panel.setToolTip(translate('OpenLP.MainWindow', 'Toggle Live Panel'))
166- self.lock_panel.setText(translate('OpenLP.MainWindow', 'L&ock Panels'))
167- self.lock_panel.setStatusTip(translate('OpenLP.MainWindow', 'Prevent the panels being moved.'))
168- self.view_live_panel.setStatusTip(translate('OpenLP.MainWindow', 'Toggle the visibility of the live panel.'))
169+ translate('OpenLP.MainWindow', 'Toggle the visibility of the Preview.'))
170+ self.view_live_panel.setText(translate('OpenLP.MainWindow', 'Li&ve'))
171+ self.view_live_panel.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Live'))
172+ self.lock_panel.setText(translate('OpenLP.MainWindow', 'L&ock visibility of the panels'))
173+ self.lock_panel.setStatusTip(translate('OpenLP.MainWindow', 'Lock visibility of the panels.'))
174+ self.view_live_panel.setStatusTip(translate('OpenLP.MainWindow', 'Toggle the visibility of the Live.'))
175 self.settings_plugin_list_item.setText(translate('OpenLP.MainWindow', '&Manage Plugins'))
176- self.settings_plugin_list_item.setStatusTip(translate('OpenLP.MainWindow', 'List the Plugins'))
177+ self.settings_plugin_list_item.setStatusTip(translate('OpenLP.MainWindow', 'You can activate or disable plugins'
178+ 'from here.'))
179 self.about_item.setText(translate('OpenLP.MainWindow', '&About'))
180- self.about_item.setStatusTip(translate('OpenLP.MainWindow', 'More information about OpenLP'))
181+ self.about_item.setStatusTip(translate('OpenLP.MainWindow', 'More information about OpenLP.'))
182 if is_win() or is_macosx():
183 self.offline_help_item.setText(translate('OpenLP.MainWindow', '&User Guide'))
184 self.on_line_help_item.setText(translate('OpenLP.MainWindow', '&Online Help'))
185@@ -485,11 +486,13 @@
186 self.update_theme_images.setStatusTip(translate('OpenLP.MainWindow',
187 'Update the preview images for all themes.'))
188 self.mode_default_item.setText(translate('OpenLP.MainWindow', '&Default'))
189- self.mode_default_item.setStatusTip(translate('OpenLP.MainWindow', 'Set the view mode back to the default.'))
190+ self.mode_default_item.setStatusTip(translate('OpenLP.MainWindow', 'Reset the interface layout back to the '
191+ 'default settings.'))
192 self.mode_setup_item.setText(translate('OpenLP.MainWindow', '&Setup'))
193- self.mode_setup_item.setStatusTip(translate('OpenLP.MainWindow', 'Set the view mode to Setup.'))
194+ self.mode_setup_item.setStatusTip(translate('OpenLP.MainWindow', 'Use layout that focuses on setting'
195+ ' up the Service.'))
196 self.mode_live_item.setText(translate('OpenLP.MainWindow', '&Live'))
197- self.mode_live_item.setStatusTip(translate('OpenLP.MainWindow', 'Set the view mode to Live.'))
198+ self.mode_live_item.setStatusTip(translate('OpenLP.MainWindow', 'Use layout that focuses on Live.'))
199
200
201 class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, RegistryProperties):
202@@ -851,9 +854,9 @@
203 return
204 import_file_name, filter_used = QtWidgets.QFileDialog.getOpenFileName(
205 self,
206- translate('OpenLP.MainWindow', 'Open File'),
207+ translate('OpenLP.MainWindow', 'Import settings'),
208 '',
209- translate('OpenLP.MainWindow', 'OpenLP Export Settings Files (*.conf)'))
210+ translate('OpenLP.MainWindow', 'OpenLP Settings (*.conf)'))
211 if not import_file_name:
212 return
213 setting_sections = []
214@@ -943,7 +946,7 @@
215 self,
216 translate('OpenLP.MainWindow', 'Export Settings File'),
217 '',
218- translate('OpenLP.MainWindow', 'OpenLP Export Settings File (*.conf)'))
219+ translate('OpenLP.MainWindow', 'Exported OpenLP Settings (*.conf)'))
220 if not export_file_name:
221 return
222 # Make sure it's a .conf file.
223@@ -1153,9 +1156,9 @@
224 :param file_name: The file name of the service file.
225 """
226 if modified:
227- title = '%s - %s*' % (UiStrings().OLPV2x, file_name)
228+ title = '%s - %s*' % (UiStrings().OLP, file_name)
229 else:
230- title = '%s - %s' % (UiStrings().OLPV2x, file_name)
231+ title = '%s - %s' % (UiStrings().OLP, file_name)
232 self.setWindowTitle(title)
233
234 def show_status_message(self, message):
235
236=== modified file 'openlp/core/ui/media/playertab.py'
237--- openlp/core/ui/media/playertab.py 2015-12-31 22:46:06 +0000
238+++ openlp/core/ui/media/playertab.py 2016-04-12 12:59:28 +0000
239@@ -125,7 +125,7 @@
240 self.media_player_group_box.setTitle(translate('OpenLP.PlayerTab', 'Available Media Players'))
241 self.player_order_group_box.setTitle(translate('OpenLP.PlayerTab', 'Player Search Order'))
242 self.background_color_group_box.setTitle(UiStrings().BackgroundColor)
243- self.background_color_label.setText(UiStrings().DefaultColor)
244+ self.background_color_label.setText(UiStrings().BackgroundColor)
245 self.information_label.setText(translate('OpenLP.PlayerTab',
246 'Visible background for videos with aspect ratio different to screen.'))
247 self.retranslate_players()
248
249=== modified file 'openlp/plugins/bibles/lib/biblestab.py'
250--- openlp/plugins/bibles/lib/biblestab.py 2015-12-31 22:46:06 +0000
251+++ openlp/plugins/bibles/lib/biblestab.py 2016-04-12 12:59:28 +0000
252@@ -174,10 +174,10 @@
253 'Note:\nChanges do not affect verses already in the service.'))
254 self.bible_second_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Display second Bible verses'))
255 self.scripture_reference_group_box.setTitle(translate('BiblesPlugin.BiblesTab', 'Custom Scripture References'))
256- self.verse_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Verse Separator:'))
257- self.range_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Range Separator:'))
258- self.list_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'List Separator:'))
259- self.end_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'End Mark:'))
260+ self.verse_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Verse separator:'))
261+ self.range_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Range separator:'))
262+ self.list_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'List separator:'))
263+ self.end_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'End mark:'))
264 tip_text = translate('BiblesPlugin.BiblesTab',
265 'Multiple alternative verse separators may be defined.\nThey have to be separated by a '
266 'vertical bar "|".\nPlease clear this edit line to use the default value.')
267
268=== modified file 'openlp/plugins/media/lib/mediaitem.py'
269--- openlp/plugins/media/lib/mediaitem.py 2016-04-03 19:44:09 +0000
270+++ openlp/plugins/media/lib/mediaitem.py 2016-04-12 12:59:28 +0000
271@@ -138,7 +138,7 @@
272 disable_optical_button_text = True
273 optical_button_text = translate('MediaPlugin.MediaItem', 'Load CD/DVD')
274 optical_button_tooltip = translate('MediaPlugin.MediaItem',
275- 'Load CD/DVD - only supported when VLC is installed and enabled')
276+ 'CD/DVD Playback is only supported if VLC is installed and enabled.')
277 self.load_optical = self.toolbar.add_toolbar_action('load_optical', icon=self.optical_icon,
278 text=optical_button_text,
279 tooltip=optical_button_tooltip,
280
281=== modified file 'openlp/plugins/media/lib/mediatab.py'
282--- openlp/plugins/media/lib/mediatab.py 2015-12-31 22:46:06 +0000
283+++ openlp/plugins/media/lib/mediatab.py 2016-04-12 12:59:28 +0000
284@@ -54,7 +54,7 @@
285 def retranslateUi(self):
286 self.advanced_group_box.setTitle(UiStrings().Advanced)
287 self.override_player_check_box.setText(translate('MediaPlugin.MediaTab', 'Allow media player to be overridden'))
288- self.auto_start_check_box.setText(translate('MediaPlugin.MediaTab', 'Start Live items automatically'))
289+ self.auto_start_check_box.setText(translate('MediaPlugin.MediaTab', 'Start live items automatically'))
290
291 def load(self):
292 self.override_player_check_box.setChecked(Settings().value(self.settings_section + '/override player'))
293
294=== modified file 'openlp/plugins/presentations/lib/powerpointcontroller.py'
295--- openlp/plugins/presentations/lib/powerpointcontroller.py 2015-12-31 22:46:06 +0000
296+++ openlp/plugins/presentations/lib/powerpointcontroller.py 2016-04-12 12:59:28 +0000
297@@ -60,7 +60,7 @@
298 Initialise the class
299 """
300 log.debug('Initialising')
301- super(PowerpointController, self).__init__(plugin, 'Powerpoint', PowerpointDocument)
302+ super(PowerpointController, self).__init__(plugin, 'PowerPoint', PowerpointDocument)
303 self.supports = ['ppt', 'pps', 'pptx', 'ppsx', 'pptm']
304 self.process = None
305
306@@ -514,7 +514,7 @@
307 log.exception('Failed to exit Powerpoint presentation after error')
308 log.exception(e)
309 critical_error_message_box(UiStrings().Error, translate('PresentationPlugin.PowerpointDocument',
310- 'An error occurred in the Powerpoint integration '
311+ 'An error occurred in the PowerPoint integration '
312 'and the presentation will be stopped. '
313 'Restart the presentation if you wish to present it.'))
314
315
316=== modified file 'openlp/plugins/presentations/lib/pptviewcontroller.py'
317--- openlp/plugins/presentations/lib/pptviewcontroller.py 2016-04-05 16:34:21 +0000
318+++ openlp/plugins/presentations/lib/pptviewcontroller.py 2016-04-12 12:59:28 +0000
319@@ -54,7 +54,7 @@
320 """
321 log.debug('Initialising')
322 self.process = None
323- super(PptviewController, self).__init__(plugin, 'Powerpoint Viewer', PptviewDocument)
324+ super(PptviewController, self).__init__(plugin, 'PowerPoint Viewer', PptviewDocument)
325 self.supports = ['ppt', 'pps', 'pptx', 'ppsx', 'pptm']
326
327 def check_available(self):
328
329=== modified file 'openlp/plugins/presentations/lib/presentationtab.py'
330--- openlp/plugins/presentations/lib/presentationtab.py 2015-12-31 22:46:06 +0000
331+++ openlp/plugins/presentations/lib/presentationtab.py 2016-04-12 12:59:28 +0000
332@@ -125,11 +125,11 @@
333 translate('PresentationPlugin.PresentationTab', 'Allow presentation application to be overridden'))
334 self.ppt_slide_click_check_box.setText(
335 translate('PresentationPlugin.PresentationTab',
336- 'Clicking on a selected slide in the slidecontroller advances to next effect.'))
337+ 'Clicking on current slide in live advances to the next effect'))
338 self.ppt_window_check_box.setText(
339 translate('PresentationPlugin.PresentationTab',
340 'Let PowerPoint control the size and position of the presentation window '
341- '(workaround for Windows 8 scaling issue).'))
342+ '(workaround for Windows 8 scaling issue)'))
343 self.pdf_program_check_box.setText(
344 translate('PresentationPlugin.PresentationTab', 'Use given full path for mudraw or ghostscript binary:'))
345
346@@ -148,10 +148,10 @@
347 controller = self.controllers[key]
348 checkbox = self.presenter_check_boxes[controller.name]
349 checkbox.setChecked(Settings().value(self.settings_section + '/' + controller.name))
350- if controller.name == 'Powerpoint' and controller.is_available():
351+ if controller.name == 'PowerPoint' and controller.is_available():
352 powerpoint_available = True
353 self.override_app_check_box.setChecked(Settings().value(self.settings_section + '/override app'))
354- # Load Powerpoint settings
355+ # Load PowerPoint settings
356 self.ppt_slide_click_check_box.setChecked(Settings().value(self.settings_section +
357 '/powerpoint slide click advance'))
358 self.ppt_slide_click_check_box.setEnabled(powerpoint_available)
359
360=== modified file 'openlp/plugins/presentations/presentationplugin.py'
361--- openlp/plugins/presentations/presentationplugin.py 2016-01-08 13:47:52 +0000
362+++ openlp/plugins/presentations/presentationplugin.py 2016-04-12 12:59:28 +0000
363@@ -40,8 +40,8 @@
364 'presentations/enable_pdf_program': QtCore.Qt.Unchecked,
365 'presentations/pdf_program': '',
366 'presentations/Impress': QtCore.Qt.Checked,
367- 'presentations/Powerpoint': QtCore.Qt.Checked,
368- 'presentations/Powerpoint Viewer': QtCore.Qt.Checked,
369+ 'presentations/PowerPoint': QtCore.Qt.Checked,
370+ 'presentations/PowerPoint Viewer': QtCore.Qt.Checked,
371 'presentations/Pdf': QtCore.Qt.Checked,
372 'presentations/presentations files': [],
373 'presentations/thumbnail_scheme': '',
374
375=== modified file 'openlp/plugins/remotes/lib/httprouter.py'
376--- openlp/plugins/remotes/lib/httprouter.py 2016-03-19 19:42:10 +0000
377+++ openlp/plugins/remotes/lib/httprouter.py 2016-04-12 12:59:28 +0000
378@@ -312,12 +312,11 @@
379 Translate various strings in the mobile app.
380 """
381 remote = translate('RemotePlugin.Mobile', 'Remote')
382- stage = translate('RemotePlugin.Mobile', 'Stage View')
383- live = translate('RemotePlugin.Mobile', 'Live View')
384+ stage = translate('RemotePlugin.Mobile', 'Stage')
385 self.template_vars = {
386- 'app_title': "%s %s" % (UiStrings().OLPV2x, remote),
387- 'stage_title': "%s %s" % (UiStrings().OLPV2x, stage),
388- 'live_title': "%s %s" % (UiStrings().OLPV2x, live),
389+ 'app_title': "OpenLP | %s" % remote,
390+ 'stage_title': "OpenLP | %s" % stage,
391+ 'live_title': "OpenLP | %s" % UiStrings().Live,
392 'service_manager': translate('RemotePlugin.Mobile', 'Service Manager'),
393 'slide_controller': translate('RemotePlugin.Mobile', 'Slide Controller'),
394 'alerts': translate('RemotePlugin.Mobile', 'Alerts'),
395
396=== modified file 'tests/functional/openlp_core_ui/test_mainwindow.py'
397--- tests/functional/openlp_core_ui/test_mainwindow.py 2016-01-15 20:37:53 +0000
398+++ tests/functional/openlp_core_ui/test_mainwindow.py 2016-04-12 12:59:28 +0000
399@@ -108,9 +108,9 @@
400
401 # WHEN no changes are made to the service
402
403- # THEN the main window's title shoud be the same as the OLPV2x string in the UiStrings class
404- self.assertEqual(self.main_window.windowTitle(), UiStrings().OLPV2x,
405- 'The main window\'s title should be the same as the OLPV2x string in UiStrings class')
406+ # THEN the main window's title shoud be the same as the OLP string in the UiStrings class
407+ self.assertEqual(self.main_window.windowTitle(), UiStrings().OLP,
408+ 'The main window\'s title should be the same as the OLP string in UiStrings class')
409
410 def set_service_modifed_test(self):
411 """
412@@ -122,8 +122,8 @@
413 self.main_window.set_service_modified(True, 'test.osz')
414
415 # THEN the main window's title should be set to the
416- self.assertEqual(self.main_window.windowTitle(), '%s - %s*' % (UiStrings().OLPV2x, 'test.osz'),
417- 'The main window\'s title should be set to "<the contents of UiStrings().OLPV2x> - test.osz*"')
418+ self.assertEqual(self.main_window.windowTitle(), '%s - %s*' % (UiStrings().OLP, 'test.osz'),
419+ 'The main window\'s title should be set to "<the contents of UiStrings().OLP> - test.osz*"')
420
421 def set_service_unmodified_test(self):
422 """
423@@ -135,8 +135,8 @@
424 self.main_window.set_service_modified(False, 'test.osz')
425
426 # THEN the main window's title should be set to the
427- self.assertEqual(self.main_window.windowTitle(), '%s - %s' % (UiStrings().OLPV2x, 'test.osz'),
428- 'The main window\'s title should be set to "<the contents of UiStrings().OLPV2x> - test.osz"')
429+ self.assertEqual(self.main_window.windowTitle(), '%s - %s' % (UiStrings().OLP, 'test.osz'),
430+ 'The main window\'s title should be set to "<the contents of UiStrings().OLP> - test.osz"')
431
432 def mainwindow_configuration_test(self):
433 """
434
435=== modified file 'tests/functional/openlp_plugins/presentations/test_mediaitem.py'
436--- tests/functional/openlp_plugins/presentations/test_mediaitem.py 2015-12-31 22:46:06 +0000
437+++ tests/functional/openlp_plugins/presentations/test_mediaitem.py 2016-04-12 12:59:28 +0000
438@@ -69,7 +69,7 @@
439 self.media_item.controllers = {
440 'Impress': impress_controller,
441 'Powerpoint': presentation_controller,
442- 'Powerpoint Viewer': presentation_viewer_controller,
443+ 'PowerPoint Viewer': presentation_viewer_controller,
444 'Pdf': pdf_controller
445 }
446
447
448=== modified file 'tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py'
449--- tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py 2015-12-31 22:46:06 +0000
450+++ tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py 2016-04-12 12:59:28 +0000
451@@ -76,7 +76,7 @@
452 controller = PowerpointController(plugin=self.mock_plugin)
453
454 # THEN: The name of the presentation controller should be correct
455- self.assertEqual('Powerpoint', controller.name,
456+ self.assertEqual('PowerPoint', controller.name,
457 'The name of the presentation controller should be correct')
458
459
460
461=== modified file 'tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py'
462--- tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py 2015-12-31 22:46:06 +0000
463+++ tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py 2016-04-12 12:59:28 +0000
464@@ -76,7 +76,7 @@
465 controller = PptviewController(plugin=self.mock_plugin)
466
467 # THEN: The name of the presentation controller should be correct
468- self.assertEqual('Powerpoint Viewer', controller.name,
469+ self.assertEqual('PowerPoint Viewer', controller.name,
470 'The name of the presentation controller should be correct')
471
472 def check_available_test(self):