Merge lp:~suutari-olli/openlp/ui-messages-part-1 into lp:openlp
- ui-messages-part-1
- Merge into trunk
Status: | Superseded |
---|---|
Proposed branch: | lp:~suutari-olli/openlp/ui-messages-part-1 |
Merge into: | lp:openlp |
Diff against target: |
520 lines (+102/-93) 16 files modified
openlp/core/common/uistrings.py (+3/-2) openlp/core/ui/advancedtab.py (+10/-10) openlp/core/ui/exceptiondialog.py (+14/-8) openlp/core/ui/exceptionform.py (+1/-1) openlp/core/ui/generaltab.py (+4/-4) openlp/core/ui/mainwindow.py (+42/-39) openlp/core/ui/media/playertab.py (+1/-1) openlp/plugins/alerts/lib/alertstab.py (+1/-1) openlp/plugins/bibles/lib/biblestab.py (+5/-5) openlp/plugins/images/lib/imagetab.py (+1/-1) openlp/plugins/media/lib/mediaitem.py (+1/-1) openlp/plugins/presentations/lib/powerpointcontroller.py (+1/-1) openlp/plugins/presentations/lib/presentationtab.py (+4/-4) openlp/plugins/remotes/lib/httprouter.py (+4/-5) openlp/plugins/songs/lib/songstab.py (+3/-3) tests/functional/openlp_core_ui/test_mainwindow.py (+7/-7) |
To merge this branch: | bzr merge lp:~suutari-olli/openlp/ui-messages-part-1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Bentley | Needs Fixing | ||
Review via email: mp+291628@code.launchpad.net |
This proposal supersedes a proposal from 2016-04-10.
This proposal has been superseded by a proposal from 2016-04-13.
Commit message
Description of the change
In this re-proposal:
- Re-did some of the changes.
- Changed Powerpoint into PowerPoint for presentation controller names.
(Also changed this on one error message, (I think it would be good to have
all Powerpoints renamed to PowerPoint so they are not mixed, lowercaps
powerpoint would remain as it is.)
- Fixed tests for checking Powerpoint name to PowerPoint.
This branch includes 3 modified tests, is that enough test coverage?
-------
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;32mSUCCESS
[←[1;31mFAILURE
Stopping after failure
Tim Bentley (trb143) wrote : Posted in a previous version of this proposal | # |
Azaziah (suutari-olli) wrote : Posted in a previous version of this proposal | # |
Thank you for the review, I've replied to the comments and made some changes.
Tim Bentley (trb143) wrote : | # |
Some wording comments.
Not sure about the impact on the change of PowerPoint.
Azaziah (suutari-olli) wrote : | # |
I replied to the comments, I'll see if I can get the traceback sorted out later.
Azaziah (suutari-olli) : | # |
Tim Bentley (trb143) : | # |
- 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
Azaziah (suutari-olli) wrote : | # |
I replied to expection error and View menu,
now re-proposing.
- 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
1 | === modified file 'openlp/core/common/uistrings.py' | |||
2 | --- openlp/core/common/uistrings.py 2016-01-23 08:15:37 +0000 | |||
3 | +++ openlp/core/common/uistrings.py 2016-04-13 16:51:01 +0000 | |||
4 | @@ -56,6 +56,7 @@ | |||
5 | 56 | self.AllFiles = translate('OpenLP.Ui', 'All Files') | 56 | self.AllFiles = translate('OpenLP.Ui', 'All Files') |
6 | 57 | self.Automatic = translate('OpenLP.Ui', 'Automatic') | 57 | self.Automatic = translate('OpenLP.Ui', 'Automatic') |
7 | 58 | self.BackgroundColor = translate('OpenLP.Ui', 'Background Color') | 58 | self.BackgroundColor = translate('OpenLP.Ui', 'Background Color') |
8 | 59 | self.BackgroundColorColon = translate('OpenLP.Ui', 'Background color:') | ||
9 | 59 | self.Bottom = translate('OpenLP.Ui', 'Bottom') | 60 | self.Bottom = translate('OpenLP.Ui', 'Bottom') |
10 | 60 | self.Browse = translate('OpenLP.Ui', 'Browse...') | 61 | self.Browse = translate('OpenLP.Ui', 'Browse...') |
11 | 61 | self.Cancel = translate('OpenLP.Ui', 'Cancel') | 62 | self.Cancel = translate('OpenLP.Ui', 'Cancel') |
12 | @@ -80,7 +81,7 @@ | |||
13 | 80 | self.File = translate('OpenLP.Ui', 'File') | 81 | self.File = translate('OpenLP.Ui', 'File') |
14 | 81 | self.FileNotFound = translate('OpenLP.Ui', 'File Not Found') | 82 | self.FileNotFound = translate('OpenLP.Ui', 'File Not Found') |
15 | 82 | self.FileNotFoundMessage = translate('OpenLP.Ui', 'File %s not found.\nPlease try selecting it individually.') | 83 | self.FileNotFoundMessage = translate('OpenLP.Ui', 'File %s not found.\nPlease try selecting it individually.') |
17 | 83 | self.FontSizePtUnit = translate('OpenLP.Ui', 'pt', 'Abbreviated font pointsize unit') | 84 | self.FontSizePtUnit = translate('OpenLP.Ui', ' pt', 'Abbreviated font pointsize unit') |
18 | 84 | self.Help = translate('OpenLP.Ui', 'Help') | 85 | self.Help = translate('OpenLP.Ui', 'Help') |
19 | 85 | self.Hours = translate('OpenLP.Ui', 'h', 'The abbreviated unit for hours') | 86 | self.Hours = translate('OpenLP.Ui', 'h', 'The abbreviated unit for hours') |
20 | 86 | self.IFdSs = translate('OpenLP.Ui', 'Invalid Folder Selected', 'Singular') | 87 | self.IFdSs = translate('OpenLP.Ui', 'Invalid Folder Selected', 'Singular') |
21 | @@ -126,7 +127,7 @@ | |||
22 | 126 | 'player is disabled.') | 127 | 'player is disabled.') |
23 | 127 | self.ResetBG = translate('OpenLP.Ui', 'Reset Background') | 128 | self.ResetBG = translate('OpenLP.Ui', 'Reset Background') |
24 | 128 | self.ResetLiveBG = translate('OpenLP.Ui', 'Reset live background.') | 129 | self.ResetLiveBG = translate('OpenLP.Ui', 'Reset live background.') |
26 | 129 | self.Seconds = translate('OpenLP.Ui', 's', 'The abbreviated unit for seconds') | 130 | self.Seconds = translate('OpenLP.Ui', ' s', 'The abbreviated unit for seconds') |
27 | 130 | self.SaveAndPreview = translate('OpenLP.Ui', 'Save && Preview') | 131 | self.SaveAndPreview = translate('OpenLP.Ui', 'Save && Preview') |
28 | 131 | self.Search = translate('OpenLP.Ui', 'Search') | 132 | self.Search = translate('OpenLP.Ui', 'Search') |
29 | 132 | self.SearchThemes = translate('OpenLP.Ui', 'Search Themes...', 'Search bar place holder text ') | 133 | self.SearchThemes = translate('OpenLP.Ui', 'Search Themes...', 'Search bar place holder text ') |
30 | 133 | 134 | ||
31 | === modified file 'openlp/core/ui/advancedtab.py' | |||
32 | --- openlp/core/ui/advancedtab.py 2016-04-05 17:30:20 +0000 | |||
33 | +++ openlp/core/ui/advancedtab.py 2016-04-13 16:51:01 +0000 | |||
34 | @@ -273,24 +273,24 @@ | |||
35 | 273 | self.tab_title_visible = UiStrings().Advanced | 273 | self.tab_title_visible = UiStrings().Advanced |
36 | 274 | self.ui_group_box.setTitle(translate('OpenLP.AdvancedTab', 'UI Settings')) | 274 | self.ui_group_box.setTitle(translate('OpenLP.AdvancedTab', 'UI Settings')) |
37 | 275 | self.data_directory_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Data Location')) | 275 | self.data_directory_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Data Location')) |
39 | 276 | self.recent_label.setText(translate('OpenLP.AdvancedTab', 'Number of recent files to display:')) | 276 | self.recent_label.setText(translate('OpenLP.AdvancedTab', 'Number of recent Service files to display:')) |
40 | 277 | self.media_plugin_check_box.setText(translate('OpenLP.AdvancedTab', | 277 | self.media_plugin_check_box.setText(translate('OpenLP.AdvancedTab', |
42 | 278 | 'Remember active media manager tab on startup')) | 278 | 'Open the last used Library category on startup')) |
43 | 279 | self.double_click_live_check_box.setText(translate('OpenLP.AdvancedTab', | 279 | self.double_click_live_check_box.setText(translate('OpenLP.AdvancedTab', |
45 | 280 | 'Double-click to send items straight to live')) | 280 | 'Double-click to send items straight to Live')) |
46 | 281 | self.single_click_preview_check_box.setText(translate('OpenLP.AdvancedTab', | 281 | self.single_click_preview_check_box.setText(translate('OpenLP.AdvancedTab', |
48 | 282 | 'Preview items when clicked in Media Manager')) | 282 | 'Preview items when clicked in Library')) |
49 | 283 | self.single_click_service_preview_check_box.setText(translate('OpenLP.AdvancedTab', | 283 | self.single_click_service_preview_check_box.setText(translate('OpenLP.AdvancedTab', |
51 | 284 | 'Preview items when clicked in Service Manager')) | 284 | 'Preview items when clicked in Service')) |
52 | 285 | self.expand_service_item_check_box.setText(translate('OpenLP.AdvancedTab', | 285 | self.expand_service_item_check_box.setText(translate('OpenLP.AdvancedTab', |
54 | 286 | 'Expand new service items on creation')) | 286 | 'Expand new Service items on creation')) |
55 | 287 | self.slide_max_height_label.setText(translate('OpenLP.AdvancedTab', | 287 | self.slide_max_height_label.setText(translate('OpenLP.AdvancedTab', |
56 | 288 | 'Max height for non-text slides\nin slide controller:')) | 288 | 'Max height for non-text slides\nin slide controller:')) |
57 | 289 | self.slide_max_height_spin_box.setSpecialValueText(translate('OpenLP.AdvancedTab', 'Disabled')) | 289 | self.slide_max_height_spin_box.setSpecialValueText(translate('OpenLP.AdvancedTab', 'Disabled')) |
58 | 290 | self.enable_auto_close_check_box.setText(translate('OpenLP.AdvancedTab', | 290 | self.enable_auto_close_check_box.setText(translate('OpenLP.AdvancedTab', |
59 | 291 | 'Enable application exit confirmation')) | 291 | 'Enable application exit confirmation')) |
60 | 292 | self.service_name_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Default Service Name')) | 292 | self.service_name_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Default Service Name')) |
62 | 293 | self.service_name_check_box.setText(translate('OpenLP.AdvancedTab', 'Enable default service name')) | 293 | self.service_name_check_box.setText(translate('OpenLP.AdvancedTab', 'Enable default Service name')) |
63 | 294 | self.service_name_time_label.setText(translate('OpenLP.AdvancedTab', 'Date and Time:')) | 294 | self.service_name_time_label.setText(translate('OpenLP.AdvancedTab', 'Date and Time:')) |
64 | 295 | self.service_name_day.setItemText(0, translate('OpenLP.AdvancedTab', 'Monday')) | 295 | self.service_name_day.setItemText(0, translate('OpenLP.AdvancedTab', 'Monday')) |
65 | 296 | self.service_name_day.setItemText(1, translate('OpenLP.AdvancedTab', 'Tuesday')) | 296 | self.service_name_day.setItemText(1, translate('OpenLP.AdvancedTab', 'Tuesday')) |
66 | @@ -300,11 +300,11 @@ | |||
67 | 300 | self.service_name_day.setItemText(5, translate('OpenLP.AdvancedTab', 'Saturday')) | 300 | self.service_name_day.setItemText(5, translate('OpenLP.AdvancedTab', 'Saturday')) |
68 | 301 | self.service_name_day.setItemText(6, translate('OpenLP.AdvancedTab', 'Sunday')) | 301 | self.service_name_day.setItemText(6, translate('OpenLP.AdvancedTab', 'Sunday')) |
69 | 302 | self.service_name_day.setItemText(7, translate('OpenLP.AdvancedTab', 'Now')) | 302 | self.service_name_day.setItemText(7, translate('OpenLP.AdvancedTab', 'Now')) |
71 | 303 | self.service_name_time.setToolTip(translate('OpenLP.AdvancedTab', 'Time when usual service starts.')) | 303 | self.service_name_time.setToolTip(translate('OpenLP.AdvancedTab', 'Time when usual Service starts.')) |
72 | 304 | self.service_name_label.setText(translate('OpenLP.AdvancedTab', 'Name:')) | 304 | self.service_name_label.setText(translate('OpenLP.AdvancedTab', 'Name:')) |
73 | 305 | self.service_name_edit.setToolTip(translate('OpenLP.AdvancedTab', 'Consult the OpenLP manual for usage.')) | 305 | self.service_name_edit.setToolTip(translate('OpenLP.AdvancedTab', 'Consult the OpenLP manual for usage.')) |
74 | 306 | self.service_name_revert_button.setToolTip( | 306 | self.service_name_revert_button.setToolTip( |
76 | 307 | translate('OpenLP.AdvancedTab', 'Revert to the default service name "%s".') % | 307 | translate('OpenLP.AdvancedTab', 'Revert to the default Service name "%s".') % |
77 | 308 | UiStrings().DefaultServiceName) | 308 | UiStrings().DefaultServiceName) |
78 | 309 | self.service_name_example_label.setText(translate('OpenLP.AdvancedTab', 'Example:')) | 309 | self.service_name_example_label.setText(translate('OpenLP.AdvancedTab', 'Example:')) |
79 | 310 | self.hide_mouse_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Mouse Cursor')) | 310 | self.hide_mouse_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Mouse Cursor')) |
80 | @@ -337,7 +337,7 @@ | |||
81 | 337 | self.slide_label.setText(translate('OpenLP.GeneralTab', 'Behavior of next/previous on the last/first slide:')) | 337 | self.slide_label.setText(translate('OpenLP.GeneralTab', 'Behavior of next/previous on the last/first slide:')) |
82 | 338 | self.end_slide_radio_button.setText(translate('OpenLP.GeneralTab', '&Remain on Slide')) | 338 | self.end_slide_radio_button.setText(translate('OpenLP.GeneralTab', '&Remain on Slide')) |
83 | 339 | self.wrap_slide_radio_button.setText(translate('OpenLP.GeneralTab', '&Wrap around')) | 339 | self.wrap_slide_radio_button.setText(translate('OpenLP.GeneralTab', '&Wrap around')) |
85 | 340 | self.next_item_radio_button.setText(translate('OpenLP.GeneralTab', '&Move to next/previous service item')) | 340 | self.next_item_radio_button.setText(translate('OpenLP.GeneralTab', '&Move to next/previous Service item')) |
86 | 341 | self.search_as_type_check_box.setText(translate('SongsPlugin.GeneralTab', 'Enable search as you type')) | 341 | self.search_as_type_check_box.setText(translate('SongsPlugin.GeneralTab', 'Enable search as you type')) |
87 | 342 | 342 | ||
88 | 343 | def load(self): | 343 | def load(self): |
89 | 344 | 344 | ||
90 | === modified file 'openlp/core/ui/exceptiondialog.py' | |||
91 | --- openlp/core/ui/exceptiondialog.py 2015-12-31 22:46:06 +0000 | |||
92 | +++ openlp/core/ui/exceptiondialog.py 2016-04-13 16:51:01 +0000 | |||
93 | @@ -43,6 +43,8 @@ | |||
94 | 43 | self.exception_layout.setObjectName('exception_layout') | 43 | self.exception_layout.setObjectName('exception_layout') |
95 | 44 | self.message_layout = QtWidgets.QHBoxLayout() | 44 | self.message_layout = QtWidgets.QHBoxLayout() |
96 | 45 | self.message_layout.setObjectName('messageLayout') | 45 | self.message_layout.setObjectName('messageLayout') |
97 | 46 | # Set margin to make the box a bit wider so the traceback is easier to read. (left, top, right, bottom) | ||
98 | 47 | self.message_layout.setContentsMargins(0, 0, 50, 0) | ||
99 | 46 | self.message_layout.addSpacing(12) | 48 | self.message_layout.addSpacing(12) |
100 | 47 | self.bug_label = QtWidgets.QLabel(exception_dialog) | 49 | self.bug_label = QtWidgets.QLabel(exception_dialog) |
101 | 48 | self.bug_label.setPixmap(QtGui.QPixmap(':/graphics/exception.png')) | 50 | self.bug_label.setPixmap(QtGui.QPixmap(':/graphics/exception.png')) |
102 | @@ -88,17 +90,21 @@ | |||
103 | 88 | """ | 90 | """ |
104 | 89 | Translate the widgets on the fly. | 91 | Translate the widgets on the fly. |
105 | 90 | """ | 92 | """ |
106 | 93 | # Note that bugs_mail is not clicable, but it adds the blue color and underlining and makes the test copyable. | ||
107 | 94 | bugs_mail = '<a href = "mailto:bugs@openlp.org" > bugs@openlp.org</a>' | ||
108 | 91 | exception_dialog.setWindowTitle(translate('OpenLP.ExceptionDialog', 'Error Occurred')) | 95 | exception_dialog.setWindowTitle(translate('OpenLP.ExceptionDialog', 'Error Occurred')) |
109 | 92 | self.description_explanation.setText( | 96 | self.description_explanation.setText( |
113 | 93 | translate('OpenLP.ExceptionDialog', 'Please enter a description of what you were doing to cause this error.' | 97 | translate('OpenLP.ExceptionDialog', '<strong>Please describe what you were trying to do.</strong> ' |
114 | 94 | ' If possible, write in English.' | 98 | ' If possible, write in English.')) |
112 | 95 | '\n(Minimum 20 characters)')) | ||
115 | 96 | self.message_label.setText( | 99 | self.message_label.setText( |
121 | 97 | translate('OpenLP.ExceptionDialog', 'Oops! OpenLP hit a problem, and couldn\'t recover. The text in the ' | 100 | translate('OpenLP.ExceptionDialog', '<strong>Oops, OpenLP hit a problem ' |
122 | 98 | 'box below contains information that might be helpful to the OpenLP ' | 101 | 'and couldn\'t recover!</strong> <br><br>' |
123 | 99 | 'developers, so please e-mail it to bugs@openlp.org, along with a ' | 102 | '<strong>You can help </strong> OpenLP developers to <strong>fix this</strong> by<br>' |
124 | 100 | 'detailed description of what you were doing when the problem ' | 103 | 'sending them a <strong>bug report</strong> to %s<br><br>' |
125 | 101 | 'occurred. Also attach any files that triggered the problem.')) | 104 | '<strong>No email app? </strong> You can <strong>save</strong> this ' |
126 | 105 | 'information to a <strong>file</strong> and<br>' | ||
127 | 106 | 'send it from your <strong>mail on browser</strong> via an <strong>attachement.</strong><br><br>' | ||
128 | 107 | '<strong>Thank you<strong> for being part of making OpenLP better!<br>') % bugs_mail) | ||
129 | 102 | self.send_report_button.setText(translate('OpenLP.ExceptionDialog', 'Send E-Mail')) | 108 | self.send_report_button.setText(translate('OpenLP.ExceptionDialog', 'Send E-Mail')) |
130 | 103 | self.save_report_button.setText(translate('OpenLP.ExceptionDialog', 'Save to File')) | 109 | self.save_report_button.setText(translate('OpenLP.ExceptionDialog', 'Save to File')) |
131 | 104 | self.attach_tile_button.setText(translate('OpenLP.ExceptionDialog', 'Attach File')) | 110 | self.attach_tile_button.setText(translate('OpenLP.ExceptionDialog', 'Attach File')) |
132 | 105 | 111 | ||
133 | === modified file 'openlp/core/ui/exceptionform.py' | |||
134 | --- openlp/core/ui/exceptionform.py 2016-04-04 19:53:54 +0000 | |||
135 | +++ openlp/core/ui/exceptionform.py 2016-04-13 16:51:01 +0000 | |||
136 | @@ -199,7 +199,7 @@ | |||
137 | 199 | else: | 199 | else: |
138 | 200 | self.__button_state(False) | 200 | self.__button_state(False) |
139 | 201 | self.description_word_count.setText( | 201 | self.description_word_count.setText( |
141 | 202 | translate('OpenLP.ExceptionDialog', 'Description characters to enter : %s') % count) | 202 | translate('OpenLP.ExceptionDialog', '%s Characters from the minimum description remaining.') % count) |
142 | 203 | 203 | ||
143 | 204 | def on_attach_file_button_clicked(self): | 204 | def on_attach_file_button_clicked(self): |
144 | 205 | """ | 205 | """ |
145 | 206 | 206 | ||
146 | === modified file 'openlp/core/ui/generaltab.py' | |||
147 | --- openlp/core/ui/generaltab.py 2016-01-16 20:13:41 +0000 | |||
148 | +++ openlp/core/ui/generaltab.py 2016-04-13 16:51:01 +0000 | |||
149 | @@ -210,15 +210,15 @@ | |||
150 | 210 | self.display_on_monitor_check.setText(translate('OpenLP.GeneralTab', 'Display if a single screen')) | 210 | self.display_on_monitor_check.setText(translate('OpenLP.GeneralTab', 'Display if a single screen')) |
151 | 211 | self.startup_group_box.setTitle(translate('OpenLP.GeneralTab', 'Application Startup')) | 211 | self.startup_group_box.setTitle(translate('OpenLP.GeneralTab', 'Application Startup')) |
152 | 212 | self.warning_check_box.setText(translate('OpenLP.GeneralTab', 'Show blank screen warning')) | 212 | self.warning_check_box.setText(translate('OpenLP.GeneralTab', 'Show blank screen warning')) |
154 | 213 | self.auto_open_check_box.setText(translate('OpenLP.GeneralTab', 'Automatically open the last service')) | 213 | self.auto_open_check_box.setText(translate('OpenLP.GeneralTab', 'Automatically open the last Service')) |
155 | 214 | self.show_splash_check_box.setText(translate('OpenLP.GeneralTab', 'Show the splash screen')) | 214 | self.show_splash_check_box.setText(translate('OpenLP.GeneralTab', 'Show the splash screen')) |
156 | 215 | self.check_for_updates_check_box.setText(translate('OpenLP.GeneralTab', 'Check for updates to OpenLP')) | 215 | self.check_for_updates_check_box.setText(translate('OpenLP.GeneralTab', 'Check for updates to OpenLP')) |
157 | 216 | self.settings_group_box.setTitle(translate('OpenLP.GeneralTab', 'Application Settings')) | 216 | self.settings_group_box.setTitle(translate('OpenLP.GeneralTab', 'Application Settings')) |
158 | 217 | self.save_check_service_check_box.setText(translate('OpenLP.GeneralTab', | 217 | self.save_check_service_check_box.setText(translate('OpenLP.GeneralTab', |
161 | 218 | 'Prompt to save before starting a new service')) | 218 | 'Prompt to save before starting a new Service')) |
162 | 219 | self.auto_unblank_check_box.setText(translate('OpenLP.GeneralTab', 'Unblank display when adding new live item')) | 219 | self.auto_unblank_check_box.setText(translate('OpenLP.GeneralTab', 'Unblank display when adding new Live item')) |
163 | 220 | self.auto_preview_check_box.setText(translate('OpenLP.GeneralTab', | 220 | self.auto_preview_check_box.setText(translate('OpenLP.GeneralTab', |
165 | 221 | 'Automatically preview next item in service')) | 221 | 'Automatically preview next item in Service')) |
166 | 222 | self.timeout_label.setText(translate('OpenLP.GeneralTab', 'Timed slide interval:')) | 222 | self.timeout_label.setText(translate('OpenLP.GeneralTab', 'Timed slide interval:')) |
167 | 223 | self.timeout_spin_box.setSuffix(translate('OpenLP.GeneralTab', ' sec')) | 223 | self.timeout_spin_box.setSuffix(translate('OpenLP.GeneralTab', ' sec')) |
168 | 224 | self.ccli_group_box.setTitle(translate('OpenLP.GeneralTab', 'CCLI Details')) | 224 | self.ccli_group_box.setTitle(translate('OpenLP.GeneralTab', 'CCLI Details')) |
169 | 225 | 225 | ||
170 | === modified file 'openlp/core/ui/mainwindow.py' | |||
171 | --- openlp/core/ui/mainwindow.py 2016-04-04 19:53:54 +0000 | |||
172 | +++ openlp/core/ui/mainwindow.py 2016-04-13 16:51:01 +0000 | |||
173 | @@ -385,21 +385,21 @@ | |||
174 | 385 | """ | 385 | """ |
175 | 386 | Set up the translation system | 386 | Set up the translation system |
176 | 387 | """ | 387 | """ |
178 | 388 | main_window.setWindowTitle(UiStrings().OLPV2x) | 388 | main_window.setWindowTitle(UiStrings().OLP) |
179 | 389 | self.file_menu.setTitle(translate('OpenLP.MainWindow', '&File')) | 389 | self.file_menu.setTitle(translate('OpenLP.MainWindow', '&File')) |
180 | 390 | self.file_import_menu.setTitle(translate('OpenLP.MainWindow', '&Import')) | 390 | self.file_import_menu.setTitle(translate('OpenLP.MainWindow', '&Import')) |
181 | 391 | self.file_export_menu.setTitle(translate('OpenLP.MainWindow', '&Export')) | 391 | self.file_export_menu.setTitle(translate('OpenLP.MainWindow', '&Export')) |
182 | 392 | self.recent_files_menu.setTitle(translate('OpenLP.MainWindow', '&Recent Services')) | 392 | self.recent_files_menu.setTitle(translate('OpenLP.MainWindow', '&Recent Services')) |
183 | 393 | self.view_menu.setTitle(translate('OpenLP.MainWindow', '&View')) | 393 | self.view_menu.setTitle(translate('OpenLP.MainWindow', '&View')) |
185 | 394 | self.view_mode_menu.setTitle(translate('OpenLP.MainWindow', 'M&ode')) | 394 | self.view_mode_menu.setTitle(translate('OpenLP.MainWindow', '&Layout Presets')) |
186 | 395 | self.tools_menu.setTitle(translate('OpenLP.MainWindow', '&Tools')) | 395 | self.tools_menu.setTitle(translate('OpenLP.MainWindow', '&Tools')) |
187 | 396 | self.settings_menu.setTitle(translate('OpenLP.MainWindow', '&Settings')) | 396 | self.settings_menu.setTitle(translate('OpenLP.MainWindow', '&Settings')) |
188 | 397 | self.settings_language_menu.setTitle(translate('OpenLP.MainWindow', '&Language')) | 397 | self.settings_language_menu.setTitle(translate('OpenLP.MainWindow', '&Language')) |
189 | 398 | self.help_menu.setTitle(translate('OpenLP.MainWindow', '&Help')) | 398 | self.help_menu.setTitle(translate('OpenLP.MainWindow', '&Help')) |
190 | 399 | self.media_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Library')) | 399 | self.media_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Library')) |
194 | 400 | self.service_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Service Manager')) | 400 | self.service_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Service')) |
195 | 401 | self.theme_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Theme Manager')) | 401 | self.theme_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Themes')) |
196 | 402 | self.projector_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Projector Manager')) | 402 | self.projector_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Projectors')) |
197 | 403 | self.file_new_item.setText(translate('OpenLP.MainWindow', '&New Service')) | 403 | self.file_new_item.setText(translate('OpenLP.MainWindow', '&New Service')) |
198 | 404 | self.file_new_item.setToolTip(UiStrings().NewService) | 404 | self.file_new_item.setToolTip(UiStrings().NewService) |
199 | 405 | self.file_new_item.setStatusTip(UiStrings().CreateService) | 405 | self.file_new_item.setStatusTip(UiStrings().CreateService) |
200 | @@ -416,7 +416,7 @@ | |||
201 | 416 | self.print_service_order_item.setText(UiStrings().PrintService) | 416 | self.print_service_order_item.setText(UiStrings().PrintService) |
202 | 417 | self.print_service_order_item.setStatusTip(translate('OpenLP.MainWindow', 'Print the current service.')) | 417 | self.print_service_order_item.setStatusTip(translate('OpenLP.MainWindow', 'Print the current service.')) |
203 | 418 | self.file_exit_item.setText(translate('OpenLP.MainWindow', 'E&xit')) | 418 | self.file_exit_item.setText(translate('OpenLP.MainWindow', 'E&xit')) |
205 | 419 | self.file_exit_item.setStatusTip(translate('OpenLP.MainWindow', 'Quit OpenLP')) | 419 | self.file_exit_item.setStatusTip(translate('OpenLP.MainWindow', 'Close OpenLP - Shut down the program.')) |
206 | 420 | self.import_theme_item.setText(translate('OpenLP.MainWindow', '&Theme')) | 420 | self.import_theme_item.setText(translate('OpenLP.MainWindow', '&Theme')) |
207 | 421 | self.import_language_item.setText(translate('OpenLP.MainWindow', '&Language')) | 421 | self.import_language_item.setText(translate('OpenLP.MainWindow', '&Language')) |
208 | 422 | self.export_theme_item.setText(translate('OpenLP.MainWindow', '&Theme')) | 422 | self.export_theme_item.setText(translate('OpenLP.MainWindow', '&Theme')) |
209 | @@ -425,41 +425,42 @@ | |||
210 | 425 | self.formatting_tag_item.setText(translate('OpenLP.MainWindow', 'Configure &Formatting Tags...')) | 425 | self.formatting_tag_item.setText(translate('OpenLP.MainWindow', 'Configure &Formatting Tags...')) |
211 | 426 | self.settings_configure_item.setText(translate('OpenLP.MainWindow', '&Configure OpenLP...')) | 426 | self.settings_configure_item.setText(translate('OpenLP.MainWindow', '&Configure OpenLP...')) |
212 | 427 | self.settings_export_item.setStatusTip( | 427 | self.settings_export_item.setStatusTip( |
214 | 428 | translate('OpenLP.MainWindow', 'Export OpenLP settings to a specified *.config file')) | 428 | translate('OpenLP.MainWindow', 'Export settings to a *.config file.')) |
215 | 429 | self.settings_export_item.setText(translate('OpenLP.MainWindow', 'Settings')) | 429 | self.settings_export_item.setText(translate('OpenLP.MainWindow', 'Settings')) |
216 | 430 | self.settings_import_item.setStatusTip( | 430 | self.settings_import_item.setStatusTip( |
219 | 431 | translate('OpenLP.MainWindow', 'Import OpenLP settings from a specified *.config file previously ' | 431 | translate('OpenLP.MainWindow', 'Import OpenLP settings from a *.config file previously exported from ' |
220 | 432 | 'exported on this or another machine')) | 432 | 'this or an another machine.')) |
221 | 433 | self.settings_import_item.setText(translate('OpenLP.MainWindow', 'Settings')) | 433 | self.settings_import_item.setText(translate('OpenLP.MainWindow', 'Settings')) |
224 | 434 | self.view_projector_manager_item.setText(translate('OPenLP.MainWindow', '&Projector Manager')) | 434 | self.view_projector_manager_item.setText(translate('OPenLP.MainWindow', '&Projectors')) |
225 | 435 | self.view_projector_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Projector Manager')) | 435 | self.view_projector_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Projectors.')) |
226 | 436 | self.view_projector_manager_item.setStatusTip(translate('OpenLP.MainWindow', | 436 | self.view_projector_manager_item.setStatusTip(translate('OpenLP.MainWindow', |
230 | 437 | 'Toggle the visibility of the Projector Manager')) | 437 | 'Toggle the visibility of the Projectors.')) |
231 | 438 | self.view_media_manager_item.setText(translate('OpenLP.MainWindow', '&Media Manager')) | 438 | self.view_media_manager_item.setText(translate('OpenLP.MainWindow', 'L&ibrary')) |
232 | 439 | self.view_media_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Media Manager')) | 439 | self.view_media_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show the Library.')) |
233 | 440 | self.view_media_manager_item.setStatusTip(translate('OpenLP.MainWindow', | 440 | self.view_media_manager_item.setStatusTip(translate('OpenLP.MainWindow', |
237 | 441 | 'Toggle the visibility of the media manager.')) | 441 | 'Toggle the visibility of the Library.')) |
238 | 442 | self.view_theme_manager_item.setText(translate('OpenLP.MainWindow', '&Theme Manager')) | 442 | self.view_theme_manager_item.setText(translate('OpenLP.MainWindow', '&Themes')) |
239 | 443 | self.view_theme_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Theme Manager')) | 443 | self.view_theme_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Themes')) |
240 | 444 | self.view_theme_manager_item.setStatusTip(translate('OpenLP.MainWindow', | 444 | self.view_theme_manager_item.setStatusTip(translate('OpenLP.MainWindow', |
244 | 445 | 'Toggle the visibility of the theme manager.')) | 445 | 'Toggle the visibility of the Themes.')) |
245 | 446 | self.view_service_manager_item.setText(translate('OpenLP.MainWindow', '&Service Manager')) | 446 | self.view_service_manager_item.setText(translate('OpenLP.MainWindow', '&Service')) |
246 | 447 | self.view_service_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Service Manager')) | 447 | self.view_service_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Service.')) |
247 | 448 | self.view_service_manager_item.setStatusTip(translate('OpenLP.MainWindow', | 448 | self.view_service_manager_item.setStatusTip(translate('OpenLP.MainWindow', |
251 | 449 | 'Toggle the visibility of the service manager.')) | 449 | 'Toggle the visibility of the Service.')) |
252 | 450 | self.view_preview_panel.setText(translate('OpenLP.MainWindow', '&Preview Panel')) | 450 | self.view_preview_panel.setText(translate('OpenLP.MainWindow', '&Preview')) |
253 | 451 | self.view_preview_panel.setToolTip(translate('OpenLP.MainWindow', 'Toggle Preview Panel')) | 451 | self.view_preview_panel.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Preview.')) |
254 | 452 | self.view_preview_panel.setStatusTip( | 452 | self.view_preview_panel.setStatusTip( |
261 | 453 | translate('OpenLP.MainWindow', 'Toggle the visibility of the preview panel.')) | 453 | translate('OpenLP.MainWindow', 'Toggle the visibility of the Preview.')) |
262 | 454 | self.view_live_panel.setText(translate('OpenLP.MainWindow', '&Live Panel')) | 454 | self.view_live_panel.setText(translate('OpenLP.MainWindow', 'Li&ve')) |
263 | 455 | self.view_live_panel.setToolTip(translate('OpenLP.MainWindow', 'Toggle Live Panel')) | 455 | self.view_live_panel.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Live')) |
264 | 456 | self.lock_panel.setText(translate('OpenLP.MainWindow', 'L&ock Panels')) | 456 | self.lock_panel.setText(translate('OpenLP.MainWindow', 'L&ock visibility of the panels')) |
265 | 457 | self.lock_panel.setStatusTip(translate('OpenLP.MainWindow', 'Prevent the panels being moved.')) | 457 | self.lock_panel.setStatusTip(translate('OpenLP.MainWindow', 'Lock visibility of the panels.')) |
266 | 458 | self.view_live_panel.setStatusTip(translate('OpenLP.MainWindow', 'Toggle the visibility of the live panel.')) | 458 | self.view_live_panel.setStatusTip(translate('OpenLP.MainWindow', 'Toggle the visibility of the Live.')) |
267 | 459 | self.settings_plugin_list_item.setText(translate('OpenLP.MainWindow', '&Manage Plugins')) | 459 | self.settings_plugin_list_item.setText(translate('OpenLP.MainWindow', '&Manage Plugins')) |
269 | 460 | self.settings_plugin_list_item.setStatusTip(translate('OpenLP.MainWindow', 'List the Plugins')) | 460 | self.settings_plugin_list_item.setStatusTip(translate('OpenLP.MainWindow', 'You can activate or disable plugins' |
270 | 461 | 'from here.')) | ||
271 | 461 | self.about_item.setText(translate('OpenLP.MainWindow', '&About')) | 462 | self.about_item.setText(translate('OpenLP.MainWindow', '&About')) |
273 | 462 | self.about_item.setStatusTip(translate('OpenLP.MainWindow', 'More information about OpenLP')) | 463 | self.about_item.setStatusTip(translate('OpenLP.MainWindow', 'More information about OpenLP.')) |
274 | 463 | if is_win() or is_macosx(): | 464 | if is_win() or is_macosx(): |
275 | 464 | self.offline_help_item.setText(translate('OpenLP.MainWindow', '&User Guide')) | 465 | self.offline_help_item.setText(translate('OpenLP.MainWindow', '&User Guide')) |
276 | 465 | self.on_line_help_item.setText(translate('OpenLP.MainWindow', '&Online Help')) | 466 | self.on_line_help_item.setText(translate('OpenLP.MainWindow', '&Online Help')) |
277 | @@ -485,11 +486,13 @@ | |||
278 | 485 | self.update_theme_images.setStatusTip(translate('OpenLP.MainWindow', | 486 | self.update_theme_images.setStatusTip(translate('OpenLP.MainWindow', |
279 | 486 | 'Update the preview images for all themes.')) | 487 | 'Update the preview images for all themes.')) |
280 | 487 | self.mode_default_item.setText(translate('OpenLP.MainWindow', '&Default')) | 488 | self.mode_default_item.setText(translate('OpenLP.MainWindow', '&Default')) |
282 | 488 | self.mode_default_item.setStatusTip(translate('OpenLP.MainWindow', 'Set the view mode back to the default.')) | 489 | self.mode_default_item.setStatusTip(translate('OpenLP.MainWindow', 'Reset the interface layout back to the ' |
283 | 490 | 'default settings.')) | ||
284 | 489 | self.mode_setup_item.setText(translate('OpenLP.MainWindow', '&Setup')) | 491 | self.mode_setup_item.setText(translate('OpenLP.MainWindow', '&Setup')) |
286 | 490 | self.mode_setup_item.setStatusTip(translate('OpenLP.MainWindow', 'Set the view mode to Setup.')) | 492 | self.mode_setup_item.setStatusTip(translate('OpenLP.MainWindow', 'Use layout that focuses on setting' |
287 | 493 | ' up the Service.')) | ||
288 | 491 | self.mode_live_item.setText(translate('OpenLP.MainWindow', '&Live')) | 494 | self.mode_live_item.setText(translate('OpenLP.MainWindow', '&Live')) |
290 | 492 | self.mode_live_item.setStatusTip(translate('OpenLP.MainWindow', 'Set the view mode to Live.')) | 495 | self.mode_live_item.setStatusTip(translate('OpenLP.MainWindow', 'Use layout that focuses on Live.')) |
291 | 493 | 496 | ||
292 | 494 | 497 | ||
293 | 495 | class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, RegistryProperties): | 498 | class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, RegistryProperties): |
294 | @@ -851,9 +854,9 @@ | |||
295 | 851 | return | 854 | return |
296 | 852 | import_file_name, filter_used = QtWidgets.QFileDialog.getOpenFileName( | 855 | import_file_name, filter_used = QtWidgets.QFileDialog.getOpenFileName( |
297 | 853 | self, | 856 | self, |
299 | 854 | translate('OpenLP.MainWindow', 'Open File'), | 857 | translate('OpenLP.MainWindow', 'Import settings'), |
300 | 855 | '', | 858 | '', |
302 | 856 | translate('OpenLP.MainWindow', 'OpenLP Export Settings Files (*.conf)')) | 859 | translate('OpenLP.MainWindow', 'OpenLP Settings (*.conf)')) |
303 | 857 | if not import_file_name: | 860 | if not import_file_name: |
304 | 858 | return | 861 | return |
305 | 859 | setting_sections = [] | 862 | setting_sections = [] |
306 | @@ -943,7 +946,7 @@ | |||
307 | 943 | self, | 946 | self, |
308 | 944 | translate('OpenLP.MainWindow', 'Export Settings File'), | 947 | translate('OpenLP.MainWindow', 'Export Settings File'), |
309 | 945 | '', | 948 | '', |
311 | 946 | translate('OpenLP.MainWindow', 'OpenLP Export Settings File (*.conf)')) | 949 | translate('OpenLP.MainWindow', 'Exported OpenLP Settings (*.conf)')) |
312 | 947 | if not export_file_name: | 950 | if not export_file_name: |
313 | 948 | return | 951 | return |
314 | 949 | # Make sure it's a .conf file. | 952 | # Make sure it's a .conf file. |
315 | @@ -1153,9 +1156,9 @@ | |||
316 | 1153 | :param file_name: The file name of the service file. | 1156 | :param file_name: The file name of the service file. |
317 | 1154 | """ | 1157 | """ |
318 | 1155 | if modified: | 1158 | if modified: |
320 | 1156 | title = '%s - %s*' % (UiStrings().OLPV2x, file_name) | 1159 | title = '%s - %s*' % (UiStrings().OLP, file_name) |
321 | 1157 | else: | 1160 | else: |
323 | 1158 | title = '%s - %s' % (UiStrings().OLPV2x, file_name) | 1161 | title = '%s - %s' % (UiStrings().OLP, file_name) |
324 | 1159 | self.setWindowTitle(title) | 1162 | self.setWindowTitle(title) |
325 | 1160 | 1163 | ||
326 | 1161 | def show_status_message(self, message): | 1164 | def show_status_message(self, message): |
327 | 1162 | 1165 | ||
328 | === modified file 'openlp/core/ui/media/playertab.py' | |||
329 | --- openlp/core/ui/media/playertab.py 2015-12-31 22:46:06 +0000 | |||
330 | +++ openlp/core/ui/media/playertab.py 2016-04-13 16:51:01 +0000 | |||
331 | @@ -125,7 +125,7 @@ | |||
332 | 125 | self.media_player_group_box.setTitle(translate('OpenLP.PlayerTab', 'Available Media Players')) | 125 | self.media_player_group_box.setTitle(translate('OpenLP.PlayerTab', 'Available Media Players')) |
333 | 126 | self.player_order_group_box.setTitle(translate('OpenLP.PlayerTab', 'Player Search Order')) | 126 | self.player_order_group_box.setTitle(translate('OpenLP.PlayerTab', 'Player Search Order')) |
334 | 127 | self.background_color_group_box.setTitle(UiStrings().BackgroundColor) | 127 | self.background_color_group_box.setTitle(UiStrings().BackgroundColor) |
336 | 128 | self.background_color_label.setText(UiStrings().DefaultColor) | 128 | self.background_color_label.setText(UiStrings().BackgroundColorColon) |
337 | 129 | self.information_label.setText(translate('OpenLP.PlayerTab', | 129 | self.information_label.setText(translate('OpenLP.PlayerTab', |
338 | 130 | 'Visible background for videos with aspect ratio different to screen.')) | 130 | 'Visible background for videos with aspect ratio different to screen.')) |
339 | 131 | self.retranslate_players() | 131 | self.retranslate_players() |
340 | 132 | 132 | ||
341 | === modified file 'openlp/plugins/alerts/lib/alertstab.py' | |||
342 | --- openlp/plugins/alerts/lib/alertstab.py 2015-12-31 22:46:06 +0000 | |||
343 | +++ openlp/plugins/alerts/lib/alertstab.py 2016-04-13 16:51:01 +0000 | |||
344 | @@ -98,7 +98,7 @@ | |||
345 | 98 | self.font_group_box.setTitle(translate('AlertsPlugin.AlertsTab', 'Font')) | 98 | self.font_group_box.setTitle(translate('AlertsPlugin.AlertsTab', 'Font')) |
346 | 99 | self.font_label.setText(translate('AlertsPlugin.AlertsTab', 'Font name:')) | 99 | self.font_label.setText(translate('AlertsPlugin.AlertsTab', 'Font name:')) |
347 | 100 | self.font_color_label.setText(translate('AlertsPlugin.AlertsTab', 'Font color:')) | 100 | self.font_color_label.setText(translate('AlertsPlugin.AlertsTab', 'Font color:')) |
349 | 101 | self.background_color_label.setText(translate('AlertsPlugin.AlertsTab', 'Background color:')) | 101 | self.background_color_label.setText(UiStrings().BackgroundColorColon) |
350 | 102 | self.font_size_label.setText(translate('AlertsPlugin.AlertsTab', 'Font size:')) | 102 | self.font_size_label.setText(translate('AlertsPlugin.AlertsTab', 'Font size:')) |
351 | 103 | self.font_size_spin_box.setSuffix(UiStrings().FontSizePtUnit) | 103 | self.font_size_spin_box.setSuffix(UiStrings().FontSizePtUnit) |
352 | 104 | self.timeout_label.setText(translate('AlertsPlugin.AlertsTab', 'Alert timeout:')) | 104 | self.timeout_label.setText(translate('AlertsPlugin.AlertsTab', 'Alert timeout:')) |
353 | 105 | 105 | ||
354 | === modified file 'openlp/plugins/bibles/lib/biblestab.py' | |||
355 | --- openlp/plugins/bibles/lib/biblestab.py 2015-12-31 22:46:06 +0000 | |||
356 | +++ openlp/plugins/bibles/lib/biblestab.py 2016-04-13 16:51:01 +0000 | |||
357 | @@ -171,13 +171,13 @@ | |||
358 | 171 | self.display_style_combo_box.setItemText(DisplayStyle.Square, | 171 | self.display_style_combo_box.setItemText(DisplayStyle.Square, |
359 | 172 | translate('BiblesPlugin.BiblesTab', '[ And ]')) | 172 | translate('BiblesPlugin.BiblesTab', '[ And ]')) |
360 | 173 | self.change_note_label.setText(translate('BiblesPlugin.BiblesTab', | 173 | self.change_note_label.setText(translate('BiblesPlugin.BiblesTab', |
362 | 174 | 'Note:\nChanges do not affect verses already in the service.')) | 174 | 'Note: Changes do not affect verses in the Service')) |
363 | 175 | self.bible_second_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Display second Bible verses')) | 175 | self.bible_second_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Display second Bible verses')) |
364 | 176 | self.scripture_reference_group_box.setTitle(translate('BiblesPlugin.BiblesTab', 'Custom Scripture References')) | 176 | self.scripture_reference_group_box.setTitle(translate('BiblesPlugin.BiblesTab', 'Custom Scripture References')) |
369 | 177 | self.verse_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Verse Separator:')) | 177 | self.verse_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Verse separator:')) |
370 | 178 | self.range_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Range Separator:')) | 178 | self.range_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Range separator:')) |
371 | 179 | self.list_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'List Separator:')) | 179 | self.list_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'List separator:')) |
372 | 180 | self.end_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'End Mark:')) | 180 | self.end_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'End mark:')) |
373 | 181 | tip_text = translate('BiblesPlugin.BiblesTab', | 181 | tip_text = translate('BiblesPlugin.BiblesTab', |
374 | 182 | 'Multiple alternative verse separators may be defined.\nThey have to be separated by a ' | 182 | 'Multiple alternative verse separators may be defined.\nThey have to be separated by a ' |
375 | 183 | 'vertical bar "|".\nPlease clear this edit line to use the default value.') | 183 | 'vertical bar "|".\nPlease clear this edit line to use the default value.') |
376 | 184 | 184 | ||
377 | === modified file 'openlp/plugins/images/lib/imagetab.py' | |||
378 | --- openlp/plugins/images/lib/imagetab.py 2015-12-31 22:46:06 +0000 | |||
379 | +++ openlp/plugins/images/lib/imagetab.py 2016-04-13 16:51:01 +0000 | |||
380 | @@ -61,7 +61,7 @@ | |||
381 | 61 | 61 | ||
382 | 62 | def retranslateUi(self): | 62 | def retranslateUi(self): |
383 | 63 | self.background_color_group_box.setTitle(UiStrings().BackgroundColor) | 63 | self.background_color_group_box.setTitle(UiStrings().BackgroundColor) |
385 | 64 | self.background_color_label.setText(UiStrings().DefaultColor) | 64 | self.background_color_label.setText(UiStrings().BackgroundColorColon) |
386 | 65 | self.information_label.setText( | 65 | self.information_label.setText( |
387 | 66 | translate('ImagesPlugin.ImageTab', 'Visible background for images with aspect ratio different to screen.')) | 66 | translate('ImagesPlugin.ImageTab', 'Visible background for images with aspect ratio different to screen.')) |
388 | 67 | 67 | ||
389 | 68 | 68 | ||
390 | === modified file 'openlp/plugins/media/lib/mediaitem.py' | |||
391 | --- openlp/plugins/media/lib/mediaitem.py 2016-04-03 19:44:09 +0000 | |||
392 | +++ openlp/plugins/media/lib/mediaitem.py 2016-04-13 16:51:01 +0000 | |||
393 | @@ -138,7 +138,7 @@ | |||
394 | 138 | disable_optical_button_text = True | 138 | disable_optical_button_text = True |
395 | 139 | optical_button_text = translate('MediaPlugin.MediaItem', 'Load CD/DVD') | 139 | optical_button_text = translate('MediaPlugin.MediaItem', 'Load CD/DVD') |
396 | 140 | optical_button_tooltip = translate('MediaPlugin.MediaItem', | 140 | optical_button_tooltip = translate('MediaPlugin.MediaItem', |
398 | 141 | 'Load CD/DVD - only supported when VLC is installed and enabled') | 141 | 'CD/DVD Playback is only supported if VLC is installed and enabled.') |
399 | 142 | self.load_optical = self.toolbar.add_toolbar_action('load_optical', icon=self.optical_icon, | 142 | self.load_optical = self.toolbar.add_toolbar_action('load_optical', icon=self.optical_icon, |
400 | 143 | text=optical_button_text, | 143 | text=optical_button_text, |
401 | 144 | tooltip=optical_button_tooltip, | 144 | tooltip=optical_button_tooltip, |
402 | 145 | 145 | ||
403 | === modified file 'openlp/plugins/presentations/lib/powerpointcontroller.py' | |||
404 | --- openlp/plugins/presentations/lib/powerpointcontroller.py 2015-12-31 22:46:06 +0000 | |||
405 | +++ openlp/plugins/presentations/lib/powerpointcontroller.py 2016-04-13 16:51:01 +0000 | |||
406 | @@ -514,7 +514,7 @@ | |||
407 | 514 | log.exception('Failed to exit Powerpoint presentation after error') | 514 | log.exception('Failed to exit Powerpoint presentation after error') |
408 | 515 | log.exception(e) | 515 | log.exception(e) |
409 | 516 | critical_error_message_box(UiStrings().Error, translate('PresentationPlugin.PowerpointDocument', | 516 | critical_error_message_box(UiStrings().Error, translate('PresentationPlugin.PowerpointDocument', |
411 | 517 | 'An error occurred in the Powerpoint integration ' | 517 | 'An error occurred in the PowerPoint integration ' |
412 | 518 | 'and the presentation will be stopped. ' | 518 | 'and the presentation will be stopped. ' |
413 | 519 | 'Restart the presentation if you wish to present it.')) | 519 | 'Restart the presentation if you wish to present it.')) |
414 | 520 | 520 | ||
415 | 521 | 521 | ||
416 | === modified file 'openlp/plugins/presentations/lib/presentationtab.py' | |||
417 | --- openlp/plugins/presentations/lib/presentationtab.py 2015-12-31 22:46:06 +0000 | |||
418 | +++ openlp/plugins/presentations/lib/presentationtab.py 2016-04-13 16:51:01 +0000 | |||
419 | @@ -125,11 +125,11 @@ | |||
420 | 125 | translate('PresentationPlugin.PresentationTab', 'Allow presentation application to be overridden')) | 125 | translate('PresentationPlugin.PresentationTab', 'Allow presentation application to be overridden')) |
421 | 126 | self.ppt_slide_click_check_box.setText( | 126 | self.ppt_slide_click_check_box.setText( |
422 | 127 | translate('PresentationPlugin.PresentationTab', | 127 | translate('PresentationPlugin.PresentationTab', |
424 | 128 | 'Clicking on a selected slide in the slidecontroller advances to next effect.')) | 128 | 'Clicking on current slide in Live advances to the next effect')) |
425 | 129 | self.ppt_window_check_box.setText( | 129 | self.ppt_window_check_box.setText( |
426 | 130 | translate('PresentationPlugin.PresentationTab', | 130 | translate('PresentationPlugin.PresentationTab', |
429 | 131 | 'Let PowerPoint control the size and position of the presentation window ' | 131 | 'Let PowerPoint control the size and monitor of the presentations\n' |
430 | 132 | '(workaround for Windows 8 scaling issue).')) | 132 | '(This may fixes PowerPoint scaling issues in Windows)')) |
431 | 133 | self.pdf_program_check_box.setText( | 133 | self.pdf_program_check_box.setText( |
432 | 134 | translate('PresentationPlugin.PresentationTab', 'Use given full path for mudraw or ghostscript binary:')) | 134 | translate('PresentationPlugin.PresentationTab', 'Use given full path for mudraw or ghostscript binary:')) |
433 | 135 | 135 | ||
434 | @@ -151,7 +151,7 @@ | |||
435 | 151 | if controller.name == 'Powerpoint' and controller.is_available(): | 151 | if controller.name == 'Powerpoint' and controller.is_available(): |
436 | 152 | powerpoint_available = True | 152 | powerpoint_available = True |
437 | 153 | self.override_app_check_box.setChecked(Settings().value(self.settings_section + '/override app')) | 153 | self.override_app_check_box.setChecked(Settings().value(self.settings_section + '/override app')) |
439 | 154 | # Load Powerpoint settings | 154 | # Load PowerPoint settings |
440 | 155 | self.ppt_slide_click_check_box.setChecked(Settings().value(self.settings_section + | 155 | self.ppt_slide_click_check_box.setChecked(Settings().value(self.settings_section + |
441 | 156 | '/powerpoint slide click advance')) | 156 | '/powerpoint slide click advance')) |
442 | 157 | self.ppt_slide_click_check_box.setEnabled(powerpoint_available) | 157 | self.ppt_slide_click_check_box.setEnabled(powerpoint_available) |
443 | 158 | 158 | ||
444 | === modified file 'openlp/plugins/remotes/lib/httprouter.py' | |||
445 | --- openlp/plugins/remotes/lib/httprouter.py 2016-03-19 19:42:10 +0000 | |||
446 | +++ openlp/plugins/remotes/lib/httprouter.py 2016-04-13 16:51:01 +0000 | |||
447 | @@ -312,12 +312,11 @@ | |||
448 | 312 | Translate various strings in the mobile app. | 312 | Translate various strings in the mobile app. |
449 | 313 | """ | 313 | """ |
450 | 314 | remote = translate('RemotePlugin.Mobile', 'Remote') | 314 | remote = translate('RemotePlugin.Mobile', 'Remote') |
453 | 315 | stage = translate('RemotePlugin.Mobile', 'Stage View') | 315 | stage = translate('RemotePlugin.Mobile', 'Stage') |
452 | 316 | live = translate('RemotePlugin.Mobile', 'Live View') | ||
454 | 317 | self.template_vars = { | 316 | self.template_vars = { |
458 | 318 | 'app_title': "%s %s" % (UiStrings().OLPV2x, remote), | 317 | 'app_title': "OpenLP | %s" % remote, |
459 | 319 | 'stage_title': "%s %s" % (UiStrings().OLPV2x, stage), | 318 | 'stage_title': "OpenLP | %s" % stage, |
460 | 320 | 'live_title': "%s %s" % (UiStrings().OLPV2x, live), | 319 | 'live_title': "OpenLP | %s" % UiStrings().Live, |
461 | 321 | 'service_manager': translate('RemotePlugin.Mobile', 'Service Manager'), | 320 | 'service_manager': translate('RemotePlugin.Mobile', 'Service Manager'), |
462 | 322 | 'slide_controller': translate('RemotePlugin.Mobile', 'Slide Controller'), | 321 | 'slide_controller': translate('RemotePlugin.Mobile', 'Slide Controller'), |
463 | 323 | 'alerts': translate('RemotePlugin.Mobile', 'Alerts'), | 322 | 'alerts': translate('RemotePlugin.Mobile', 'Alerts'), |
464 | 324 | 323 | ||
465 | === modified file 'openlp/plugins/songs/lib/songstab.py' | |||
466 | --- openlp/plugins/songs/lib/songstab.py 2015-12-31 22:46:06 +0000 | |||
467 | +++ openlp/plugins/songs/lib/songstab.py 2016-04-13 16:51:01 +0000 | |||
468 | @@ -68,10 +68,10 @@ | |||
469 | 68 | def retranslateUi(self): | 68 | def retranslateUi(self): |
470 | 69 | self.mode_group_box.setTitle(translate('SongsPlugin.SongsTab', 'Songs Mode')) | 69 | self.mode_group_box.setTitle(translate('SongsPlugin.SongsTab', 'Songs Mode')) |
471 | 70 | self.tool_bar_active_check_box.setText(translate('SongsPlugin.SongsTab', | 70 | self.tool_bar_active_check_box.setText(translate('SongsPlugin.SongsTab', |
474 | 71 | 'Display verses on live tool bar')) | 71 | 'Enable "Go to verse" button in Live panel')) |
475 | 72 | self.update_on_edit_check_box.setText(translate('SongsPlugin.SongsTab', 'Update service from song edit')) | 72 | self.update_on_edit_check_box.setText(translate('SongsPlugin.SongsTab', 'Update Service from song edit')) |
476 | 73 | self.add_from_service_check_box.setText(translate('SongsPlugin.SongsTab', | 73 | self.add_from_service_check_box.setText(translate('SongsPlugin.SongsTab', |
478 | 74 | 'Import missing songs from service files')) | 74 | 'Import missing songs from Service files')) |
479 | 75 | self.display_songbook_check_box.setText(translate('SongsPlugin.SongsTab', 'Display songbook in footer')) | 75 | self.display_songbook_check_box.setText(translate('SongsPlugin.SongsTab', 'Display songbook in footer')) |
480 | 76 | self.display_copyright_check_box.setText(translate('SongsPlugin.SongsTab', | 76 | self.display_copyright_check_box.setText(translate('SongsPlugin.SongsTab', |
481 | 77 | 'Display "%s" symbol before copyright info') % | 77 | 'Display "%s" symbol before copyright info') % |
482 | 78 | 78 | ||
483 | === modified file 'tests/functional/openlp_core_ui/test_mainwindow.py' | |||
484 | --- tests/functional/openlp_core_ui/test_mainwindow.py 2016-01-15 20:37:53 +0000 | |||
485 | +++ tests/functional/openlp_core_ui/test_mainwindow.py 2016-04-13 16:51:01 +0000 | |||
486 | @@ -108,9 +108,9 @@ | |||
487 | 108 | 108 | ||
488 | 109 | # WHEN no changes are made to the service | 109 | # WHEN no changes are made to the service |
489 | 110 | 110 | ||
493 | 111 | # THEN the main window's title shoud be the same as the OLPV2x string in the UiStrings class | 111 | # THEN the main window's title shoud be the same as the OLP string in the UiStrings class |
494 | 112 | self.assertEqual(self.main_window.windowTitle(), UiStrings().OLPV2x, | 112 | self.assertEqual(self.main_window.windowTitle(), UiStrings().OLP, |
495 | 113 | 'The main window\'s title should be the same as the OLPV2x string in UiStrings class') | 113 | 'The main window\'s title should be the same as the OLP string in UiStrings class') |
496 | 114 | 114 | ||
497 | 115 | def set_service_modifed_test(self): | 115 | def set_service_modifed_test(self): |
498 | 116 | """ | 116 | """ |
499 | @@ -122,8 +122,8 @@ | |||
500 | 122 | self.main_window.set_service_modified(True, 'test.osz') | 122 | self.main_window.set_service_modified(True, 'test.osz') |
501 | 123 | 123 | ||
502 | 124 | # THEN the main window's title should be set to the | 124 | # THEN the main window's title should be set to the |
505 | 125 | self.assertEqual(self.main_window.windowTitle(), '%s - %s*' % (UiStrings().OLPV2x, 'test.osz'), | 125 | self.assertEqual(self.main_window.windowTitle(), '%s - %s*' % (UiStrings().OLP, 'test.osz'), |
506 | 126 | 'The main window\'s title should be set to "<the contents of UiStrings().OLPV2x> - test.osz*"') | 126 | 'The main window\'s title should be set to "<the contents of UiStrings().OLP> - test.osz*"') |
507 | 127 | 127 | ||
508 | 128 | def set_service_unmodified_test(self): | 128 | def set_service_unmodified_test(self): |
509 | 129 | """ | 129 | """ |
510 | @@ -135,8 +135,8 @@ | |||
511 | 135 | self.main_window.set_service_modified(False, 'test.osz') | 135 | self.main_window.set_service_modified(False, 'test.osz') |
512 | 136 | 136 | ||
513 | 137 | # THEN the main window's title should be set to the | 137 | # THEN the main window's title should be set to the |
516 | 138 | self.assertEqual(self.main_window.windowTitle(), '%s - %s' % (UiStrings().OLPV2x, 'test.osz'), | 138 | self.assertEqual(self.main_window.windowTitle(), '%s - %s' % (UiStrings().OLP, 'test.osz'), |
517 | 139 | 'The main window\'s title should be set to "<the contents of UiStrings().OLPV2x> - test.osz"') | 139 | 'The main window\'s title should be set to "<the contents of UiStrings().OLP> - test.osz"') |
518 | 140 | 140 | ||
519 | 141 | def mainwindow_configuration_test(self): | 141 | def mainwindow_configuration_test(self): |
520 | 142 | """ | 142 | """ |
Not convinced with the removal of the version - see email.
Some improvements in the text as some changes can be made even clearer.