From 1739492520b354585cb90eafdb930d808e6b1332 Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Sun, 3 Apr 2016 18:54:39 +0300 Subject: [PATCH 01/18] This branch includes the following UI string changes: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These changes mainly take place on mainwindow.py but few other strings are changed as well. 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. In "Configurate OpenLP": - Changed typing for all labels to lowercase (Expect for starting videos automatically, that string may needs to be changed once bug related to that is fixed) - 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: --- openlp/core/ui/advancedtab.py | 8 +- openlp/core/ui/mainwindow.py | 75 ++++++++++--------- openlp/core/ui/media/playertab.py | 2 +- openlp/plugins/bibles/lib/biblestab.py | 8 +- openlp/plugins/media/lib/mediaitem.py | 2 +- .../presentations/lib/presentationtab.py | 4 +- 6 files changed, 51 insertions(+), 48 deletions(-) diff --git a/openlp/core/ui/advancedtab.py b/openlp/core/ui/advancedtab.py index 08adc0f29..9c75c4856 100644 --- a/openlp/core/ui/advancedtab.py +++ b/openlp/core/ui/advancedtab.py @@ -266,15 +266,15 @@ class AdvancedTab(SettingsTab): self.tab_title_visible = UiStrings().Advanced self.ui_group_box.setTitle(translate('OpenLP.AdvancedTab', 'UI Settings')) self.data_directory_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Data Location')) - self.recent_label.setText(translate('OpenLP.AdvancedTab', 'Number of recent files to display:')) + self.recent_label.setText(translate('OpenLP.AdvancedTab', 'Number of recent service files to display:')) self.media_plugin_check_box.setText(translate('OpenLP.AdvancedTab', - 'Remember active media manager tab on startup')) + 'Open the last used library category on startup')) self.double_click_live_check_box.setText(translate('OpenLP.AdvancedTab', 'Double-click to send items straight to live')) self.single_click_preview_check_box.setText(translate('OpenLP.AdvancedTab', - 'Preview items when clicked in Media Manager')) + 'Preview items when clicked in library')) self.single_click_service_preview_check_box.setText(translate('OpenLP.AdvancedTab', - 'Preview items when clicked in Service Manager')) + 'Preview items when clicked in service')) self.expand_service_item_check_box.setText(translate('OpenLP.AdvancedTab', 'Expand new service items on creation')) self.enable_auto_close_check_box.setText(translate('OpenLP.AdvancedTab', diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 3fd154c14..7bb19934d 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -391,15 +391,15 @@ class Ui_MainWindow(object): self.file_export_menu.setTitle(translate('OpenLP.MainWindow', '&Export')) self.recent_files_menu.setTitle(translate('OpenLP.MainWindow', '&Recent Services')) self.view_menu.setTitle(translate('OpenLP.MainWindow', '&View')) - self.view_mode_menu.setTitle(translate('OpenLP.MainWindow', 'M&ode')) + self.view_mode_menu.setTitle(translate('OpenLP.MainWindow', '&Layout Presets')) self.tools_menu.setTitle(translate('OpenLP.MainWindow', '&Tools')) self.settings_menu.setTitle(translate('OpenLP.MainWindow', '&Settings')) self.settings_language_menu.setTitle(translate('OpenLP.MainWindow', '&Language')) self.help_menu.setTitle(translate('OpenLP.MainWindow', '&Help')) self.media_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Library')) - self.service_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Service Manager')) - self.theme_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Theme Manager')) - self.projector_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Projector Manager')) + self.service_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Service')) + self.theme_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Themes')) + self.projector_manager_dock.setWindowTitle(translate('OpenLP.MainWindow', 'Projectors')) self.file_new_item.setText(translate('OpenLP.MainWindow', '&New Service')) self.file_new_item.setToolTip(UiStrings().NewService) self.file_new_item.setStatusTip(UiStrings().CreateService) @@ -416,7 +416,7 @@ class Ui_MainWindow(object): self.print_service_order_item.setText(UiStrings().PrintService) self.print_service_order_item.setStatusTip(translate('OpenLP.MainWindow', 'Print the current service.')) self.file_exit_item.setText(translate('OpenLP.MainWindow', 'E&xit')) - self.file_exit_item.setStatusTip(translate('OpenLP.MainWindow', 'Quit OpenLP')) + self.file_exit_item.setStatusTip(translate('OpenLP.MainWindow', 'Exit OpenLP - Shut down the program.')) self.import_theme_item.setText(translate('OpenLP.MainWindow', '&Theme')) self.import_language_item.setText(translate('OpenLP.MainWindow', '&Language')) self.export_theme_item.setText(translate('OpenLP.MainWindow', '&Theme')) @@ -425,41 +425,42 @@ class Ui_MainWindow(object): self.formatting_tag_item.setText(translate('OpenLP.MainWindow', 'Configure &Formatting Tags...')) self.settings_configure_item.setText(translate('OpenLP.MainWindow', '&Configure OpenLP...')) self.settings_export_item.setStatusTip( - translate('OpenLP.MainWindow', 'Export OpenLP settings to a specified *.config file')) + translate('OpenLP.MainWindow', 'Export settings to a .config file.')) self.settings_export_item.setText(translate('OpenLP.MainWindow', 'Settings')) self.settings_import_item.setStatusTip( - translate('OpenLP.MainWindow', 'Import OpenLP settings from a specified *.config file previously ' - 'exported on this or another machine')) + translate('OpenLP.MainWindow', 'Import settings from a .config file previously exported from ' + 'this or an another machine.')) self.settings_import_item.setText(translate('OpenLP.MainWindow', 'Settings')) - self.view_projector_manager_item.setText(translate('OPenLP.MainWindow', '&Projector Manager')) - self.view_projector_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Projector Manager')) + self.view_projector_manager_item.setText(translate('OPenLP.MainWindow', '&Projectors')) + self.view_projector_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Projectors.')) self.view_projector_manager_item.setStatusTip(translate('OpenLP.MainWindow', - 'Toggle the visibility of the Projector Manager')) - self.view_media_manager_item.setText(translate('OpenLP.MainWindow', '&Media Manager')) - self.view_media_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Media Manager')) + 'Toggle the visibility of the Projectors.')) + self.view_media_manager_item.setText(translate('OpenLP.MainWindow', 'L&ibrary')) + self.view_media_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show the Library.')) self.view_media_manager_item.setStatusTip(translate('OpenLP.MainWindow', - 'Toggle the visibility of the media manager.')) - self.view_theme_manager_item.setText(translate('OpenLP.MainWindow', '&Theme Manager')) - self.view_theme_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Theme Manager')) + 'Toggle the visibility of the Library.')) + self.view_theme_manager_item.setText(translate('OpenLP.MainWindow', '&Themes')) + self.view_theme_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Themes')) self.view_theme_manager_item.setStatusTip(translate('OpenLP.MainWindow', - 'Toggle the visibility of the theme manager.')) - self.view_service_manager_item.setText(translate('OpenLP.MainWindow', '&Service Manager')) - self.view_service_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Service Manager')) + 'Toggle the visibility of the Themes.')) + self.view_service_manager_item.setText(translate('OpenLP.MainWindow', '&Service')) + self.view_service_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Service.')) self.view_service_manager_item.setStatusTip(translate('OpenLP.MainWindow', - 'Toggle the visibility of the service manager.')) - self.view_preview_panel.setText(translate('OpenLP.MainWindow', '&Preview Panel')) - self.view_preview_panel.setToolTip(translate('OpenLP.MainWindow', 'Toggle Preview Panel')) + 'Toggle the visibility of the Service.')) + self.view_preview_panel.setText(translate('OpenLP.MainWindow', '&Preview')) + self.view_preview_panel.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Preview.')) self.view_preview_panel.setStatusTip( - translate('OpenLP.MainWindow', 'Toggle the visibility of the preview panel.')) - self.view_live_panel.setText(translate('OpenLP.MainWindow', '&Live Panel')) - self.view_live_panel.setToolTip(translate('OpenLP.MainWindow', 'Toggle Live Panel')) - self.lock_panel.setText(translate('OpenLP.MainWindow', 'L&ock Panels')) - self.lock_panel.setStatusTip(translate('OpenLP.MainWindow', 'Prevent the panels being moved.')) - self.view_live_panel.setStatusTip(translate('OpenLP.MainWindow', 'Toggle the visibility of the live panel.')) + translate('OpenLP.MainWindow', 'Toggle the visibility of the Preview.')) + self.view_live_panel.setText(translate('OpenLP.MainWindow', 'Li&ve')) + self.view_live_panel.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Live')) + self.lock_panel.setText(translate('OpenLP.MainWindow', 'L&ock visibility of the panels')) + self.lock_panel.setStatusTip(translate('OpenLP.MainWindow', 'Lock visibility of the panels.')) + self.view_live_panel.setStatusTip(translate('OpenLP.MainWindow', 'Toggle the visibility of the Live.')) self.settings_plugin_list_item.setText(translate('OpenLP.MainWindow', '&Manage Plugins')) - self.settings_plugin_list_item.setStatusTip(translate('OpenLP.MainWindow', 'List the Plugins')) + self.settings_plugin_list_item.setStatusTip(translate('OpenLP.MainWindow', 'You can activate or disable plugins' + 'from here.')) self.about_item.setText(translate('OpenLP.MainWindow', '&About')) - self.about_item.setStatusTip(translate('OpenLP.MainWindow', 'More information about OpenLP')) + self.about_item.setStatusTip(translate('OpenLP.MainWindow', 'More information about OpenLP.')) if is_win() or is_macosx(): self.offline_help_item.setText(translate('OpenLP.MainWindow', '&User Guide')) self.on_line_help_item.setText(translate('OpenLP.MainWindow', '&Online Help')) @@ -485,11 +486,13 @@ class Ui_MainWindow(object): self.update_theme_images.setStatusTip(translate('OpenLP.MainWindow', 'Update the preview images for all themes.')) self.mode_default_item.setText(translate('OpenLP.MainWindow', '&Default')) - self.mode_default_item.setStatusTip(translate('OpenLP.MainWindow', 'Set the view mode back to the default.')) + self.mode_default_item.setStatusTip(translate('OpenLP.MainWindow', 'Reset the interface layout back to the ' + 'default settings.')) self.mode_setup_item.setText(translate('OpenLP.MainWindow', '&Setup')) - self.mode_setup_item.setStatusTip(translate('OpenLP.MainWindow', 'Set the view mode to Setup.')) + self.mode_setup_item.setStatusTip(translate('OpenLP.MainWindow', 'Use layout that focuses on setting' + ' up the Service.')) self.mode_live_item.setText(translate('OpenLP.MainWindow', '&Live')) - self.mode_live_item.setStatusTip(translate('OpenLP.MainWindow', 'Set the view mode to Live.')) + self.mode_live_item.setStatusTip(translate('OpenLP.MainWindow', 'Use layout that focuses on Live.')) class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, RegistryProperties): @@ -851,9 +854,9 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, RegistryProperties): return import_file_name, filter_used = QtWidgets.QFileDialog.getOpenFileName( self, - translate('OpenLP.MainWindow', 'Open File'), + translate('OpenLP.MainWindow', 'Import settings'), '', - translate('OpenLP.MainWindow', 'OpenLP Export Settings Files (*.conf)')) + translate('OpenLP.MainWindow', 'OpenLP Settings (.conf)')) if not import_file_name: return setting_sections = [] @@ -943,7 +946,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, RegistryProperties): self, translate('OpenLP.MainWindow', 'Export Settings File'), '', - translate('OpenLP.MainWindow', 'OpenLP Export Settings File (*.conf)')) + translate('OpenLP.MainWindow', 'Exported OpenLP Settings (.conf)')) if not export_file_name: return # Make sure it's a .conf file. diff --git a/openlp/core/ui/media/playertab.py b/openlp/core/ui/media/playertab.py index 3db5e06b4..543b5d8b9 100644 --- a/openlp/core/ui/media/playertab.py +++ b/openlp/core/ui/media/playertab.py @@ -125,7 +125,7 @@ class PlayerTab(SettingsTab): self.media_player_group_box.setTitle(translate('OpenLP.PlayerTab', 'Available Media Players')) self.player_order_group_box.setTitle(translate('OpenLP.PlayerTab', 'Player Search Order')) self.background_color_group_box.setTitle(UiStrings().BackgroundColor) - self.background_color_label.setText(UiStrings().DefaultColor) + self.background_color_label.setText(UiStrings().BackgroundColor) self.information_label.setText(translate('OpenLP.PlayerTab', 'Visible background for videos with aspect ratio different to screen.')) self.retranslate_players() diff --git a/openlp/plugins/bibles/lib/biblestab.py b/openlp/plugins/bibles/lib/biblestab.py index 5438d07f2..4fe5403cf 100644 --- a/openlp/plugins/bibles/lib/biblestab.py +++ b/openlp/plugins/bibles/lib/biblestab.py @@ -174,10 +174,10 @@ class BiblesTab(SettingsTab): 'Note:\nChanges do not affect verses already in the service.')) self.bible_second_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Display second Bible verses')) self.scripture_reference_group_box.setTitle(translate('BiblesPlugin.BiblesTab', 'Custom Scripture References')) - self.verse_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Verse Separator:')) - self.range_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Range Separator:')) - self.list_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'List Separator:')) - self.end_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'End Mark:')) + self.verse_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Verse separator:')) + self.range_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Range separator:')) + self.list_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'List separator:')) + self.end_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'End mark:')) tip_text = translate('BiblesPlugin.BiblesTab', 'Multiple alternative verse separators may be defined.\nThey have to be separated by a ' 'vertical bar "|".\nPlease clear this edit line to use the default value.') diff --git a/openlp/plugins/media/lib/mediaitem.py b/openlp/plugins/media/lib/mediaitem.py index 09b32b308..4c48adedc 100644 --- a/openlp/plugins/media/lib/mediaitem.py +++ b/openlp/plugins/media/lib/mediaitem.py @@ -138,7 +138,7 @@ class MediaMediaItem(MediaManagerItem, RegistryProperties): disable_optical_button_text = True optical_button_text = translate('MediaPlugin.MediaItem', 'Load CD/DVD') optical_button_tooltip = translate('MediaPlugin.MediaItem', - 'Load CD/DVD - only supported when VLC is installed and enabled') + 'CD/DVD Playback is only supported if VLC is installed and enabled.') self.load_optical = self.toolbar.add_toolbar_action('load_optical', icon=self.optical_icon, text=optical_button_text, tooltip=optical_button_tooltip, diff --git a/openlp/plugins/presentations/lib/presentationtab.py b/openlp/plugins/presentations/lib/presentationtab.py index cbe881853..592854b45 100644 --- a/openlp/plugins/presentations/lib/presentationtab.py +++ b/openlp/plugins/presentations/lib/presentationtab.py @@ -125,7 +125,7 @@ class PresentationTab(SettingsTab): translate('PresentationPlugin.PresentationTab', 'Allow presentation application to be overridden')) self.ppt_slide_click_check_box.setText( translate('PresentationPlugin.PresentationTab', - 'Clicking on a selected slide in the slidecontroller advances to next effect.')) + 'Clicking on a selected slide in Live advances to the next effect.')) self.ppt_window_check_box.setText( translate('PresentationPlugin.PresentationTab', 'Let PowerPoint control the size and position of the presentation window ' @@ -151,7 +151,7 @@ class PresentationTab(SettingsTab): if controller.name == 'Powerpoint' and controller.is_available(): powerpoint_available = True self.override_app_check_box.setChecked(Settings().value(self.settings_section + '/override app')) - # Load Powerpoint settings + # Load PowerPoint settings self.ppt_slide_click_check_box.setChecked(Settings().value(self.settings_section + '/powerpoint slide click advance')) self.ppt_slide_click_check_box.setEnabled(powerpoint_available) From dafbc3f0542dfd91d4e1818f59e5e48970707205 Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Sun, 10 Apr 2016 02:51:41 +0300 Subject: [PATCH 02/18] In this commit: - Removed version number from main window name - Removed version number from remote window names - Reworked the traceback error message (New text, added margin to right) --- openlp/core/ui/exceptiondialog.py | 21 +++++++++++++-------- openlp/core/ui/exceptionform.py | 2 +- openlp/core/ui/mainwindow.py | 6 +++--- openlp/plugins/media/lib/mediatab.py | 2 +- openlp/plugins/remotes/lib/httprouter.py | 10 +++++----- 5 files changed, 23 insertions(+), 18 deletions(-) diff --git a/openlp/core/ui/exceptiondialog.py b/openlp/core/ui/exceptiondialog.py index 9b835ea81..bad89f2ca 100644 --- a/openlp/core/ui/exceptiondialog.py +++ b/openlp/core/ui/exceptiondialog.py @@ -43,6 +43,8 @@ class Ui_ExceptionDialog(object): self.exception_layout.setObjectName('exception_layout') self.message_layout = QtWidgets.QHBoxLayout() self.message_layout.setObjectName('messageLayout') + # Set margin to make the box a bit wider so the traceback is easier to read. (left, top, right, bottom) + self.message_layout.setContentsMargins(0, 0, 50, 0) self.message_layout.addSpacing(12) self.bug_label = QtWidgets.QLabel(exception_dialog) self.bug_label.setPixmap(QtGui.QPixmap(':/graphics/exception.png')) @@ -90,15 +92,18 @@ class Ui_ExceptionDialog(object): """ exception_dialog.setWindowTitle(translate('OpenLP.ExceptionDialog', 'Error Occurred')) self.description_explanation.setText( - translate('OpenLP.ExceptionDialog', 'Please enter a description of what you were doing to cause this error.' - ' If possible, write in English.' - '\n(Minimum 20 characters)')) + translate('OpenLP.ExceptionDialog', 'Please describe what you were trying to do. ' + ' If possible, write in English.')) self.message_label.setText( - translate('OpenLP.ExceptionDialog', 'Oops! OpenLP hit a problem, and couldn\'t recover. The text in the ' - 'box below contains information that might be helpful to the OpenLP ' - 'developers, so please e-mail it to bugs@openlp.org, along with a ' - 'detailed description of what you were doing when the problem ' - 'occurred. Also attach any files that triggered the problem.')) + translate('OpenLP.ExceptionDialog', 'Oops, OpenLP hit a problem ' + 'and couldn\'t recover!

' + 'You can help OpenLP developers to fix this by
' + 'sending them a bug report ' + 'to bugs@openlp.org

' + 'No email app? You can save this ' + 'information to a file and
' + 'send it from your mail on browser via an attachement.

' + 'Thank you for being part of making OpenLP better!')) self.send_report_button.setText(translate('OpenLP.ExceptionDialog', 'Send E-Mail')) self.save_report_button.setText(translate('OpenLP.ExceptionDialog', 'Save to File')) self.attach_tile_button.setText(translate('OpenLP.ExceptionDialog', 'Attach File')) diff --git a/openlp/core/ui/exceptionform.py b/openlp/core/ui/exceptionform.py index 2e4661579..f161e9b3b 100644 --- a/openlp/core/ui/exceptionform.py +++ b/openlp/core/ui/exceptionform.py @@ -200,7 +200,7 @@ class ExceptionForm(QtWidgets.QDialog, Ui_ExceptionDialog, RegistryProperties): else: self.__button_state(False) self.description_word_count.setText( - translate('OpenLP.ExceptionDialog', 'Description characters to enter : %s') % count) + translate('OpenLP.ExceptionDialog', '%s Characters from the minimum description remaining.') % count) def on_attach_file_button_clicked(self): """ diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 7bb19934d..2e5ff2c39 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -385,7 +385,7 @@ class Ui_MainWindow(object): """ Set up the translation system """ - main_window.setWindowTitle(UiStrings().OLPV2x) + main_window.setWindowTitle(UiStrings().OLP) self.file_menu.setTitle(translate('OpenLP.MainWindow', '&File')) self.file_import_menu.setTitle(translate('OpenLP.MainWindow', '&Import')) self.file_export_menu.setTitle(translate('OpenLP.MainWindow', '&Export')) @@ -1156,9 +1156,9 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, RegistryProperties): :param file_name: The file name of the service file. """ if modified: - title = '%s - %s*' % (UiStrings().OLPV2x, file_name) + title = '%s - %s*' % (UiStrings().OLP, file_name) else: - title = '%s - %s' % (UiStrings().OLPV2x, file_name) + title = '%s - %s' % (UiStrings().OLP, file_name) self.setWindowTitle(title) def show_status_message(self, message): diff --git a/openlp/plugins/media/lib/mediatab.py b/openlp/plugins/media/lib/mediatab.py index 5b8fb7c2f..fcd899b0c 100644 --- a/openlp/plugins/media/lib/mediatab.py +++ b/openlp/plugins/media/lib/mediatab.py @@ -54,7 +54,7 @@ class MediaTab(SettingsTab): def retranslateUi(self): self.advanced_group_box.setTitle(UiStrings().Advanced) self.override_player_check_box.setText(translate('MediaPlugin.MediaTab', 'Allow media player to be overridden')) - self.auto_start_check_box.setText(translate('MediaPlugin.MediaTab', 'Start Live items automatically')) + self.auto_start_check_box.setText(translate('MediaPlugin.MediaTab', 'Start live items automatically')) def load(self): self.override_player_check_box.setChecked(Settings().value(self.settings_section + '/override player')) diff --git a/openlp/plugins/remotes/lib/httprouter.py b/openlp/plugins/remotes/lib/httprouter.py index d5e8cda1c..0a8e44432 100644 --- a/openlp/plugins/remotes/lib/httprouter.py +++ b/openlp/plugins/remotes/lib/httprouter.py @@ -312,12 +312,12 @@ class HttpRouter(RegistryProperties): Translate various strings in the mobile app. """ remote = translate('RemotePlugin.Mobile', 'Remote') - stage = translate('RemotePlugin.Mobile', 'Stage View') - live = translate('RemotePlugin.Mobile', 'Live View') + stage = translate('RemotePlugin.Mobile', 'Stage') + #live = translate('RemotePlugin.Mobile', 'Live') self.template_vars = { - 'app_title': "%s %s" % (UiStrings().OLPV2x, remote), - 'stage_title': "%s %s" % (UiStrings().OLPV2x, stage), - 'live_title': "%s %s" % (UiStrings().OLPV2x, live), + 'app_title': "OpenLP | %s" % remote, + 'stage_title': "OpenLP | %s" % stage, + 'live_title': "OpenLP | %s" % (UiStrings().Live), 'service_manager': translate('RemotePlugin.Mobile', 'Service Manager'), 'slide_controller': translate('RemotePlugin.Mobile', 'Slide Controller'), 'alerts': translate('RemotePlugin.Mobile', 'Alerts'), From c5f0f86cbbeaa75f9d288828ea99f0fa215f669e Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Sun, 10 Apr 2016 02:55:24 +0300 Subject: [PATCH 03/18] In this commit: - Removed version number from main window name - Removed version number from remote window names - Reworked the traceback error message (New text, added margin to right) - Changed typing of "Live" to live in start live items automatically on media tab. - This is the actual changelog for last rev, commited it by mistake before removing one comment. --- openlp/plugins/remotes/lib/httprouter.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openlp/plugins/remotes/lib/httprouter.py b/openlp/plugins/remotes/lib/httprouter.py index 0a8e44432..f91a3fe35 100644 --- a/openlp/plugins/remotes/lib/httprouter.py +++ b/openlp/plugins/remotes/lib/httprouter.py @@ -313,11 +313,10 @@ class HttpRouter(RegistryProperties): """ remote = translate('RemotePlugin.Mobile', 'Remote') stage = translate('RemotePlugin.Mobile', 'Stage') - #live = translate('RemotePlugin.Mobile', 'Live') self.template_vars = { 'app_title': "OpenLP | %s" % remote, 'stage_title': "OpenLP | %s" % stage, - 'live_title': "OpenLP | %s" % (UiStrings().Live), + 'live_title': "OpenLP | %s" % UiStrings().Live, 'service_manager': translate('RemotePlugin.Mobile', 'Service Manager'), 'slide_controller': translate('RemotePlugin.Mobile', 'Slide Controller'), 'alerts': translate('RemotePlugin.Mobile', 'Alerts'), From 0275b067117e8ab6d7340413a92975c44dea32cd Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Sun, 10 Apr 2016 03:12:18 +0300 Subject: [PATCH 04/18] Hopefully fixed the test for checking the main window name... --- tests/functional/openlp_core_ui/test_mainwindow.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/functional/openlp_core_ui/test_mainwindow.py b/tests/functional/openlp_core_ui/test_mainwindow.py index a49ded25c..7f962609e 100644 --- a/tests/functional/openlp_core_ui/test_mainwindow.py +++ b/tests/functional/openlp_core_ui/test_mainwindow.py @@ -108,9 +108,9 @@ class TestMainWindow(TestCase, TestMixin): # WHEN no changes are made to the service - # THEN the main window's title shoud be the same as the OLPV2x string in the UiStrings class - self.assertEqual(self.main_window.windowTitle(), UiStrings().OLPV2x, - 'The main window\'s title should be the same as the OLPV2x string in UiStrings class') + # THEN the main window's title shoud be the same as the OLP string in the UiStrings class + self.assertEqual(self.main_window.windowTitle(), UiStrings().OLP, + 'The main window\'s title should be the same as the OLP string in UiStrings class') def set_service_modifed_test(self): """ @@ -122,8 +122,8 @@ class TestMainWindow(TestCase, TestMixin): self.main_window.set_service_modified(True, 'test.osz') # THEN the main window's title should be set to the - self.assertEqual(self.main_window.windowTitle(), '%s - %s*' % (UiStrings().OLPV2x, 'test.osz'), - 'The main window\'s title should be set to " - test.osz*"') + self.assertEqual(self.main_window.windowTitle(), '%s - %s*' % (UiStrings().OLP, 'test.osz'), + 'The main window\'s title should be set to " - test.osz*"') def set_service_unmodified_test(self): """ @@ -135,8 +135,8 @@ class TestMainWindow(TestCase, TestMixin): self.main_window.set_service_modified(False, 'test.osz') # THEN the main window's title should be set to the - self.assertEqual(self.main_window.windowTitle(), '%s - %s' % (UiStrings().OLPV2x, 'test.osz'), - 'The main window\'s title should be set to " - test.osz"') + self.assertEqual(self.main_window.windowTitle(), '%s - %s' % (UiStrings().OLP, 'test.osz'), + 'The main window\'s title should be set to " - test.osz"') def mainwindow_configuration_test(self): """ From 4af785bf1dd2e78fc1a2aa152ea879ea74f7cd77 Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Tue, 12 Apr 2016 05:29:10 +0300 Subject: [PATCH 05/18] - Re-did some of the changes. - Fixed Powerpoint to PowerPoint in presentation controllers and one error. --- openlp/core/ui/mainwindow.py | 8 ++++---- openlp/plugins/presentations/lib/powerpointcontroller.py | 4 ++-- openlp/plugins/presentations/lib/pptviewcontroller.py | 2 +- openlp/plugins/presentations/lib/presentationtab.py | 6 +++--- openlp/plugins/presentations/presentationplugin.py | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 2e5ff2c39..ec4d5e237 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -416,7 +416,7 @@ class Ui_MainWindow(object): self.print_service_order_item.setText(UiStrings().PrintService) self.print_service_order_item.setStatusTip(translate('OpenLP.MainWindow', 'Print the current service.')) self.file_exit_item.setText(translate('OpenLP.MainWindow', 'E&xit')) - self.file_exit_item.setStatusTip(translate('OpenLP.MainWindow', 'Exit OpenLP - Shut down the program.')) + self.file_exit_item.setStatusTip(translate('OpenLP.MainWindow', 'Close OpenLP - Shut down the program.')) self.import_theme_item.setText(translate('OpenLP.MainWindow', '&Theme')) self.import_language_item.setText(translate('OpenLP.MainWindow', '&Language')) self.export_theme_item.setText(translate('OpenLP.MainWindow', '&Theme')) @@ -425,10 +425,10 @@ class Ui_MainWindow(object): self.formatting_tag_item.setText(translate('OpenLP.MainWindow', 'Configure &Formatting Tags...')) self.settings_configure_item.setText(translate('OpenLP.MainWindow', '&Configure OpenLP...')) self.settings_export_item.setStatusTip( - translate('OpenLP.MainWindow', 'Export settings to a .config file.')) + translate('OpenLP.MainWindow', 'Export settings to a *.config file.')) self.settings_export_item.setText(translate('OpenLP.MainWindow', 'Settings')) self.settings_import_item.setStatusTip( - translate('OpenLP.MainWindow', 'Import settings from a .config file previously exported from ' + translate('OpenLP.MainWindow', 'Import OpenLP settings from a *.config file previously exported from ' 'this or an another machine.')) self.settings_import_item.setText(translate('OpenLP.MainWindow', 'Settings')) self.view_projector_manager_item.setText(translate('OPenLP.MainWindow', '&Projectors')) @@ -946,7 +946,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, RegistryProperties): self, translate('OpenLP.MainWindow', 'Export Settings File'), '', - translate('OpenLP.MainWindow', 'Exported OpenLP Settings (.conf)')) + translate('OpenLP.MainWindow', 'Exported OpenLP Settings (*.conf)')) if not export_file_name: return # Make sure it's a .conf file. diff --git a/openlp/plugins/presentations/lib/powerpointcontroller.py b/openlp/plugins/presentations/lib/powerpointcontroller.py index 6cc6a8450..e5e7c40b9 100644 --- a/openlp/plugins/presentations/lib/powerpointcontroller.py +++ b/openlp/plugins/presentations/lib/powerpointcontroller.py @@ -60,7 +60,7 @@ class PowerpointController(PresentationController): Initialise the class """ log.debug('Initialising') - super(PowerpointController, self).__init__(plugin, 'Powerpoint', PowerpointDocument) + super(PowerpointController, self).__init__(plugin, 'PowerPoint', PowerpointDocument) self.supports = ['ppt', 'pps', 'pptx', 'ppsx', 'pptm'] self.process = None @@ -514,7 +514,7 @@ class PowerpointDocument(PresentationDocument): log.exception('Failed to exit Powerpoint presentation after error') log.exception(e) critical_error_message_box(UiStrings().Error, translate('PresentationPlugin.PowerpointDocument', - 'An error occurred in the Powerpoint integration ' + 'An error occurred in the PowerPoint integration ' 'and the presentation will be stopped. ' 'Restart the presentation if you wish to present it.')) diff --git a/openlp/plugins/presentations/lib/pptviewcontroller.py b/openlp/plugins/presentations/lib/pptviewcontroller.py index aba0aa88e..f1a3a49f8 100644 --- a/openlp/plugins/presentations/lib/pptviewcontroller.py +++ b/openlp/plugins/presentations/lib/pptviewcontroller.py @@ -55,7 +55,7 @@ class PptviewController(PresentationController): """ log.debug('Initialising') self.process = None - super(PptviewController, self).__init__(plugin, 'Powerpoint Viewer', PptviewDocument) + super(PptviewController, self).__init__(plugin, 'PowerPoint Viewer', PptviewDocument) self.supports = ['ppt', 'pps', 'pptx', 'ppsx', 'pptm'] def check_available(self): diff --git a/openlp/plugins/presentations/lib/presentationtab.py b/openlp/plugins/presentations/lib/presentationtab.py index 592854b45..55bffbb2b 100644 --- a/openlp/plugins/presentations/lib/presentationtab.py +++ b/openlp/plugins/presentations/lib/presentationtab.py @@ -125,11 +125,11 @@ class PresentationTab(SettingsTab): translate('PresentationPlugin.PresentationTab', 'Allow presentation application to be overridden')) self.ppt_slide_click_check_box.setText( translate('PresentationPlugin.PresentationTab', - 'Clicking on a selected slide in Live advances to the next effect.')) + 'Clicking on a selected slide in live advances to the next effect')) self.ppt_window_check_box.setText( translate('PresentationPlugin.PresentationTab', 'Let PowerPoint control the size and position of the presentation window ' - '(workaround for Windows 8 scaling issue).')) + '(workaround for Windows 8 scaling issue)')) self.pdf_program_check_box.setText( translate('PresentationPlugin.PresentationTab', 'Use given full path for mudraw or ghostscript binary:')) @@ -148,7 +148,7 @@ class PresentationTab(SettingsTab): controller = self.controllers[key] checkbox = self.presenter_check_boxes[controller.name] checkbox.setChecked(Settings().value(self.settings_section + '/' + controller.name)) - if controller.name == 'Powerpoint' and controller.is_available(): + if controller.name == 'PowerPoint' and controller.is_available(): powerpoint_available = True self.override_app_check_box.setChecked(Settings().value(self.settings_section + '/override app')) # Load PowerPoint settings diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py index ff14d821c..330ff0cc5 100644 --- a/openlp/plugins/presentations/presentationplugin.py +++ b/openlp/plugins/presentations/presentationplugin.py @@ -40,8 +40,8 @@ __default_settings__ = {'presentations/override app': QtCore.Qt.Unchecked, 'presentations/enable_pdf_program': QtCore.Qt.Unchecked, 'presentations/pdf_program': '', 'presentations/Impress': QtCore.Qt.Checked, - 'presentations/Powerpoint': QtCore.Qt.Checked, - 'presentations/Powerpoint Viewer': QtCore.Qt.Checked, + 'presentations/PowerPoint': QtCore.Qt.Checked, + 'presentations/PowerPoint Viewer': QtCore.Qt.Checked, 'presentations/Pdf': QtCore.Qt.Checked, 'presentations/presentations files': [], 'presentations/thumbnail_scheme': '', From 2c9502418fbb0e695f60b64d51c3439eced1825f Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Tue, 12 Apr 2016 05:54:23 +0300 Subject: [PATCH 06/18] - Fixed PPT name tests by changing Powerpoint into PowerPoint - Replaced resources.py with trunk version. --- tests/functional/openlp_plugins/presentations/test_mediaitem.py | 2 +- .../openlp_plugins/presentations/test_powerpointcontroller.py | 2 +- .../openlp_plugins/presentations/test_pptviewcontroller.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/functional/openlp_plugins/presentations/test_mediaitem.py b/tests/functional/openlp_plugins/presentations/test_mediaitem.py index a689966ec..daa2886f6 100644 --- a/tests/functional/openlp_plugins/presentations/test_mediaitem.py +++ b/tests/functional/openlp_plugins/presentations/test_mediaitem.py @@ -69,7 +69,7 @@ class TestMediaItem(TestCase, TestMixin): self.media_item.controllers = { 'Impress': impress_controller, 'Powerpoint': presentation_controller, - 'Powerpoint Viewer': presentation_viewer_controller, + 'PowerPoint Viewer': presentation_viewer_controller, 'Pdf': pdf_controller } diff --git a/tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py b/tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py index c6ddb8238..935aa7881 100644 --- a/tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py +++ b/tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py @@ -76,7 +76,7 @@ class TestPowerpointController(TestCase, TestMixin): controller = PowerpointController(plugin=self.mock_plugin) # THEN: The name of the presentation controller should be correct - self.assertEqual('Powerpoint', controller.name, + self.assertEqual('PowerPoint', controller.name, 'The name of the presentation controller should be correct') diff --git a/tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py b/tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py index 104c0e1fa..d54379db7 100644 --- a/tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py +++ b/tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py @@ -76,7 +76,7 @@ class TestPptviewController(TestCase, TestMixin): controller = PptviewController(plugin=self.mock_plugin) # THEN: The name of the presentation controller should be correct - self.assertEqual('Powerpoint Viewer', controller.name, + self.assertEqual('PowerPoint Viewer', controller.name, 'The name of the presentation controller should be correct') def check_available_test(self): From 42b72ab3a6da8a91ff5eaf814e71d19d538cf294 Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Tue, 12 Apr 2016 06:08:47 +0300 Subject: [PATCH 07/18] Added back the last missing * --- openlp/core/ui/mainwindow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index ec4d5e237..676a38098 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -856,7 +856,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow, RegistryProperties): self, translate('OpenLP.MainWindow', 'Import settings'), '', - translate('OpenLP.MainWindow', 'OpenLP Settings (.conf)')) + translate('OpenLP.MainWindow', 'OpenLP Settings (*.conf)')) if not import_file_name: return setting_sections = [] From 6a0108ced152a172430e79b894db36a8a11783d0 Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Tue, 12 Apr 2016 15:58:00 +0300 Subject: [PATCH 08/18] - Changed: Clicking on selected slide in live advances to the next effect to Clicking on current slide in live advances to the next effect --- openlp/plugins/presentations/lib/presentationtab.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/plugins/presentations/lib/presentationtab.py b/openlp/plugins/presentations/lib/presentationtab.py index 55bffbb2b..5d272ceda 100644 --- a/openlp/plugins/presentations/lib/presentationtab.py +++ b/openlp/plugins/presentations/lib/presentationtab.py @@ -125,7 +125,7 @@ class PresentationTab(SettingsTab): translate('PresentationPlugin.PresentationTab', 'Allow presentation application to be overridden')) self.ppt_slide_click_check_box.setText( translate('PresentationPlugin.PresentationTab', - 'Clicking on a selected slide in live advances to the next effect')) + 'Clicking on current slide in live advances to the next effect')) self.ppt_window_check_box.setText( translate('PresentationPlugin.PresentationTab', 'Let PowerPoint control the size and position of the presentation window ' From 33078b426ff8860ccefecbdd19d62b5d0254c0da Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Wed, 13 Apr 2016 17:10:47 +0300 Subject: [PATCH 09/18] - Reverted the Powerpoint > PowerPoint changes. --- openlp/plugins/presentations/lib/powerpointcontroller.py | 2 +- openlp/plugins/presentations/lib/pptviewcontroller.py | 2 +- openlp/plugins/presentations/lib/presentationtab.py | 2 +- openlp/plugins/presentations/presentationplugin.py | 4 ++-- .../functional/openlp_plugins/presentations/test_mediaitem.py | 2 +- .../openlp_plugins/presentations/test_powerpointcontroller.py | 2 +- .../openlp_plugins/presentations/test_pptviewcontroller.py | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/openlp/plugins/presentations/lib/powerpointcontroller.py b/openlp/plugins/presentations/lib/powerpointcontroller.py index e5e7c40b9..2e6959ade 100644 --- a/openlp/plugins/presentations/lib/powerpointcontroller.py +++ b/openlp/plugins/presentations/lib/powerpointcontroller.py @@ -60,7 +60,7 @@ class PowerpointController(PresentationController): Initialise the class """ log.debug('Initialising') - super(PowerpointController, self).__init__(plugin, 'PowerPoint', PowerpointDocument) + super(PowerpointController, self).__init__(plugin, 'Powerpoint', PowerpointDocument) self.supports = ['ppt', 'pps', 'pptx', 'ppsx', 'pptm'] self.process = None diff --git a/openlp/plugins/presentations/lib/pptviewcontroller.py b/openlp/plugins/presentations/lib/pptviewcontroller.py index f1a3a49f8..aba0aa88e 100644 --- a/openlp/plugins/presentations/lib/pptviewcontroller.py +++ b/openlp/plugins/presentations/lib/pptviewcontroller.py @@ -55,7 +55,7 @@ class PptviewController(PresentationController): """ log.debug('Initialising') self.process = None - super(PptviewController, self).__init__(plugin, 'PowerPoint Viewer', PptviewDocument) + super(PptviewController, self).__init__(plugin, 'Powerpoint Viewer', PptviewDocument) self.supports = ['ppt', 'pps', 'pptx', 'ppsx', 'pptm'] def check_available(self): diff --git a/openlp/plugins/presentations/lib/presentationtab.py b/openlp/plugins/presentations/lib/presentationtab.py index 5d272ceda..62c94832b 100644 --- a/openlp/plugins/presentations/lib/presentationtab.py +++ b/openlp/plugins/presentations/lib/presentationtab.py @@ -148,7 +148,7 @@ class PresentationTab(SettingsTab): controller = self.controllers[key] checkbox = self.presenter_check_boxes[controller.name] checkbox.setChecked(Settings().value(self.settings_section + '/' + controller.name)) - if controller.name == 'PowerPoint' and controller.is_available(): + if controller.name == 'Powerpoint' and controller.is_available(): powerpoint_available = True self.override_app_check_box.setChecked(Settings().value(self.settings_section + '/override app')) # Load PowerPoint settings diff --git a/openlp/plugins/presentations/presentationplugin.py b/openlp/plugins/presentations/presentationplugin.py index 330ff0cc5..ff14d821c 100644 --- a/openlp/plugins/presentations/presentationplugin.py +++ b/openlp/plugins/presentations/presentationplugin.py @@ -40,8 +40,8 @@ __default_settings__ = {'presentations/override app': QtCore.Qt.Unchecked, 'presentations/enable_pdf_program': QtCore.Qt.Unchecked, 'presentations/pdf_program': '', 'presentations/Impress': QtCore.Qt.Checked, - 'presentations/PowerPoint': QtCore.Qt.Checked, - 'presentations/PowerPoint Viewer': QtCore.Qt.Checked, + 'presentations/Powerpoint': QtCore.Qt.Checked, + 'presentations/Powerpoint Viewer': QtCore.Qt.Checked, 'presentations/Pdf': QtCore.Qt.Checked, 'presentations/presentations files': [], 'presentations/thumbnail_scheme': '', diff --git a/tests/functional/openlp_plugins/presentations/test_mediaitem.py b/tests/functional/openlp_plugins/presentations/test_mediaitem.py index daa2886f6..a689966ec 100644 --- a/tests/functional/openlp_plugins/presentations/test_mediaitem.py +++ b/tests/functional/openlp_plugins/presentations/test_mediaitem.py @@ -69,7 +69,7 @@ class TestMediaItem(TestCase, TestMixin): self.media_item.controllers = { 'Impress': impress_controller, 'Powerpoint': presentation_controller, - 'PowerPoint Viewer': presentation_viewer_controller, + 'Powerpoint Viewer': presentation_viewer_controller, 'Pdf': pdf_controller } diff --git a/tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py b/tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py index 935aa7881..c6ddb8238 100644 --- a/tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py +++ b/tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py @@ -76,7 +76,7 @@ class TestPowerpointController(TestCase, TestMixin): controller = PowerpointController(plugin=self.mock_plugin) # THEN: The name of the presentation controller should be correct - self.assertEqual('PowerPoint', controller.name, + self.assertEqual('Powerpoint', controller.name, 'The name of the presentation controller should be correct') diff --git a/tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py b/tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py index d54379db7..104c0e1fa 100644 --- a/tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py +++ b/tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py @@ -76,7 +76,7 @@ class TestPptviewController(TestCase, TestMixin): controller = PptviewController(plugin=self.mock_plugin) # THEN: The name of the presentation controller should be correct - self.assertEqual('PowerPoint Viewer', controller.name, + self.assertEqual('Powerpoint Viewer', controller.name, 'The name of the presentation controller should be correct') def check_available_test(self): From feb549a8e7ba10f5b92a0cb0271f657dc767de94 Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Wed, 13 Apr 2016 19:14:35 +0300 Subject: [PATCH 10/18] - 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. --- openlp/core/common/uistrings.py | 5 +++-- openlp/core/ui/advancedtab.py | 20 +++++++++---------- openlp/core/ui/generaltab.py | 8 ++++---- openlp/core/ui/media/playertab.py | 2 +- openlp/plugins/alerts/lib/alertstab.py | 2 +- openlp/plugins/bibles/lib/biblestab.py | 2 +- openlp/plugins/images/lib/imagetab.py | 2 +- openlp/plugins/media/lib/mediatab.py | 2 +- .../presentations/lib/presentationtab.py | 6 +++--- openlp/plugins/songs/lib/songstab.py | 6 +++--- 10 files changed, 28 insertions(+), 27 deletions(-) diff --git a/openlp/core/common/uistrings.py b/openlp/core/common/uistrings.py index 33ebb0a5b..f5d0514cb 100644 --- a/openlp/core/common/uistrings.py +++ b/openlp/core/common/uistrings.py @@ -56,6 +56,7 @@ class UiStrings(object): self.AllFiles = translate('OpenLP.Ui', 'All Files') self.Automatic = translate('OpenLP.Ui', 'Automatic') self.BackgroundColor = translate('OpenLP.Ui', 'Background Color') + self.BackgroundColorColon = translate('OpenLP.Ui', 'Background color:') self.Bottom = translate('OpenLP.Ui', 'Bottom') self.Browse = translate('OpenLP.Ui', 'Browse...') self.Cancel = translate('OpenLP.Ui', 'Cancel') @@ -80,7 +81,7 @@ class UiStrings(object): self.File = translate('OpenLP.Ui', 'File') self.FileNotFound = translate('OpenLP.Ui', 'File Not Found') self.FileNotFoundMessage = translate('OpenLP.Ui', 'File %s not found.\nPlease try selecting it individually.') - self.FontSizePtUnit = translate('OpenLP.Ui', 'pt', 'Abbreviated font pointsize unit') + self.FontSizePtUnit = translate('OpenLP.Ui', ' pt', 'Abbreviated font pointsize unit') self.Help = translate('OpenLP.Ui', 'Help') self.Hours = translate('OpenLP.Ui', 'h', 'The abbreviated unit for hours') self.IFdSs = translate('OpenLP.Ui', 'Invalid Folder Selected', 'Singular') @@ -126,7 +127,7 @@ class UiStrings(object): 'player is disabled.') self.ResetBG = translate('OpenLP.Ui', 'Reset Background') self.ResetLiveBG = translate('OpenLP.Ui', 'Reset live background.') - self.Seconds = translate('OpenLP.Ui', 's', 'The abbreviated unit for seconds') + self.Seconds = translate('OpenLP.Ui', ' s', 'The abbreviated unit for seconds') self.SaveAndPreview = translate('OpenLP.Ui', 'Save && Preview') self.Search = translate('OpenLP.Ui', 'Search') self.SearchThemes = translate('OpenLP.Ui', 'Search Themes...', 'Search bar place holder text ') diff --git a/openlp/core/ui/advancedtab.py b/openlp/core/ui/advancedtab.py index 378670376..c96743e65 100644 --- a/openlp/core/ui/advancedtab.py +++ b/openlp/core/ui/advancedtab.py @@ -273,24 +273,24 @@ class AdvancedTab(SettingsTab): self.tab_title_visible = UiStrings().Advanced self.ui_group_box.setTitle(translate('OpenLP.AdvancedTab', 'UI Settings')) self.data_directory_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Data Location')) - self.recent_label.setText(translate('OpenLP.AdvancedTab', 'Number of recent service files to display:')) + self.recent_label.setText(translate('OpenLP.AdvancedTab', 'Number of recent Service files to display:')) self.media_plugin_check_box.setText(translate('OpenLP.AdvancedTab', - 'Open the last used library category on startup')) + 'Open the last used Library category on startup')) self.double_click_live_check_box.setText(translate('OpenLP.AdvancedTab', - 'Double-click to send items straight to live')) + 'Double-click to send items straight to Live')) self.single_click_preview_check_box.setText(translate('OpenLP.AdvancedTab', - 'Preview items when clicked in library')) + 'Preview items when clicked in Library')) self.single_click_service_preview_check_box.setText(translate('OpenLP.AdvancedTab', - 'Preview items when clicked in service')) + 'Preview items when clicked in Service')) self.expand_service_item_check_box.setText(translate('OpenLP.AdvancedTab', - 'Expand new service items on creation')) + 'Expand new Service items on creation')) self.slide_max_height_label.setText(translate('OpenLP.AdvancedTab', 'Max height for non-text slides\nin slide controller:')) self.slide_max_height_spin_box.setSpecialValueText(translate('OpenLP.AdvancedTab', 'Disabled')) self.enable_auto_close_check_box.setText(translate('OpenLP.AdvancedTab', 'Enable application exit confirmation')) self.service_name_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Default Service Name')) - self.service_name_check_box.setText(translate('OpenLP.AdvancedTab', 'Enable default service name')) + self.service_name_check_box.setText(translate('OpenLP.AdvancedTab', 'Enable default Service name')) self.service_name_time_label.setText(translate('OpenLP.AdvancedTab', 'Date and Time:')) self.service_name_day.setItemText(0, translate('OpenLP.AdvancedTab', 'Monday')) self.service_name_day.setItemText(1, translate('OpenLP.AdvancedTab', 'Tuesday')) @@ -300,11 +300,11 @@ class AdvancedTab(SettingsTab): self.service_name_day.setItemText(5, translate('OpenLP.AdvancedTab', 'Saturday')) self.service_name_day.setItemText(6, translate('OpenLP.AdvancedTab', 'Sunday')) self.service_name_day.setItemText(7, translate('OpenLP.AdvancedTab', 'Now')) - self.service_name_time.setToolTip(translate('OpenLP.AdvancedTab', 'Time when usual service starts.')) + self.service_name_time.setToolTip(translate('OpenLP.AdvancedTab', 'Time when usual Service starts.')) self.service_name_label.setText(translate('OpenLP.AdvancedTab', 'Name:')) self.service_name_edit.setToolTip(translate('OpenLP.AdvancedTab', 'Consult the OpenLP manual for usage.')) self.service_name_revert_button.setToolTip( - translate('OpenLP.AdvancedTab', 'Revert to the default service name "%s".') % + translate('OpenLP.AdvancedTab', 'Revert to the default Service name "%s".') % UiStrings().DefaultServiceName) self.service_name_example_label.setText(translate('OpenLP.AdvancedTab', 'Example:')) self.hide_mouse_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Mouse Cursor')) @@ -337,7 +337,7 @@ class AdvancedTab(SettingsTab): self.slide_label.setText(translate('OpenLP.GeneralTab', 'Behavior of next/previous on the last/first slide:')) self.end_slide_radio_button.setText(translate('OpenLP.GeneralTab', '&Remain on Slide')) self.wrap_slide_radio_button.setText(translate('OpenLP.GeneralTab', '&Wrap around')) - self.next_item_radio_button.setText(translate('OpenLP.GeneralTab', '&Move to next/previous service item')) + self.next_item_radio_button.setText(translate('OpenLP.GeneralTab', '&Move to next/previous Service item')) self.search_as_type_check_box.setText(translate('SongsPlugin.GeneralTab', 'Enable search as you type')) def load(self): diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index 8ed8b3edf..1d72caccd 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -210,15 +210,15 @@ class GeneralTab(SettingsTab): self.display_on_monitor_check.setText(translate('OpenLP.GeneralTab', 'Display if a single screen')) self.startup_group_box.setTitle(translate('OpenLP.GeneralTab', 'Application Startup')) self.warning_check_box.setText(translate('OpenLP.GeneralTab', 'Show blank screen warning')) - self.auto_open_check_box.setText(translate('OpenLP.GeneralTab', 'Automatically open the last service')) + self.auto_open_check_box.setText(translate('OpenLP.GeneralTab', 'Automatically open the last Service')) self.show_splash_check_box.setText(translate('OpenLP.GeneralTab', 'Show the splash screen')) self.check_for_updates_check_box.setText(translate('OpenLP.GeneralTab', 'Check for updates to OpenLP')) self.settings_group_box.setTitle(translate('OpenLP.GeneralTab', 'Application Settings')) self.save_check_service_check_box.setText(translate('OpenLP.GeneralTab', - 'Prompt to save before starting a new service')) - self.auto_unblank_check_box.setText(translate('OpenLP.GeneralTab', 'Unblank display when adding new live item')) + 'Prompt to save before starting a new Service')) + self.auto_unblank_check_box.setText(translate('OpenLP.GeneralTab', 'Unblank display when adding new Live item')) self.auto_preview_check_box.setText(translate('OpenLP.GeneralTab', - 'Automatically preview next item in service')) + 'Automatically preview next item in Service')) self.timeout_label.setText(translate('OpenLP.GeneralTab', 'Timed slide interval:')) self.timeout_spin_box.setSuffix(translate('OpenLP.GeneralTab', ' sec')) self.ccli_group_box.setTitle(translate('OpenLP.GeneralTab', 'CCLI Details')) diff --git a/openlp/core/ui/media/playertab.py b/openlp/core/ui/media/playertab.py index 543b5d8b9..6a2e866b1 100644 --- a/openlp/core/ui/media/playertab.py +++ b/openlp/core/ui/media/playertab.py @@ -125,7 +125,7 @@ class PlayerTab(SettingsTab): self.media_player_group_box.setTitle(translate('OpenLP.PlayerTab', 'Available Media Players')) self.player_order_group_box.setTitle(translate('OpenLP.PlayerTab', 'Player Search Order')) self.background_color_group_box.setTitle(UiStrings().BackgroundColor) - self.background_color_label.setText(UiStrings().BackgroundColor) + self.background_color_label.setText(UiStrings().BackgroundColorColon) self.information_label.setText(translate('OpenLP.PlayerTab', 'Visible background for videos with aspect ratio different to screen.')) self.retranslate_players() diff --git a/openlp/plugins/alerts/lib/alertstab.py b/openlp/plugins/alerts/lib/alertstab.py index 2875493b6..f97530a7b 100644 --- a/openlp/plugins/alerts/lib/alertstab.py +++ b/openlp/plugins/alerts/lib/alertstab.py @@ -98,7 +98,7 @@ class AlertsTab(SettingsTab): self.font_group_box.setTitle(translate('AlertsPlugin.AlertsTab', 'Font')) self.font_label.setText(translate('AlertsPlugin.AlertsTab', 'Font name:')) self.font_color_label.setText(translate('AlertsPlugin.AlertsTab', 'Font color:')) - self.background_color_label.setText(translate('AlertsPlugin.AlertsTab', 'Background color:')) + self.background_color_label.setText(UiStrings().BackgroundColorColon) self.font_size_label.setText(translate('AlertsPlugin.AlertsTab', 'Font size:')) self.font_size_spin_box.setSuffix(UiStrings().FontSizePtUnit) self.timeout_label.setText(translate('AlertsPlugin.AlertsTab', 'Alert timeout:')) diff --git a/openlp/plugins/bibles/lib/biblestab.py b/openlp/plugins/bibles/lib/biblestab.py index 4fe5403cf..2d002c991 100644 --- a/openlp/plugins/bibles/lib/biblestab.py +++ b/openlp/plugins/bibles/lib/biblestab.py @@ -171,7 +171,7 @@ class BiblesTab(SettingsTab): self.display_style_combo_box.setItemText(DisplayStyle.Square, translate('BiblesPlugin.BiblesTab', '[ And ]')) self.change_note_label.setText(translate('BiblesPlugin.BiblesTab', - 'Note:\nChanges do not affect verses already in the service.')) + 'Note: Changes do not affect verses in the Service')) self.bible_second_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Display second Bible verses')) self.scripture_reference_group_box.setTitle(translate('BiblesPlugin.BiblesTab', 'Custom Scripture References')) self.verse_separator_check_box.setText(translate('BiblesPlugin.BiblesTab', 'Verse separator:')) diff --git a/openlp/plugins/images/lib/imagetab.py b/openlp/plugins/images/lib/imagetab.py index 80578dc56..0c3dcc341 100644 --- a/openlp/plugins/images/lib/imagetab.py +++ b/openlp/plugins/images/lib/imagetab.py @@ -61,7 +61,7 @@ class ImageTab(SettingsTab): def retranslateUi(self): self.background_color_group_box.setTitle(UiStrings().BackgroundColor) - self.background_color_label.setText(UiStrings().DefaultColor) + self.background_color_label.setText(UiStrings().BackgroundColorColon) self.information_label.setText( translate('ImagesPlugin.ImageTab', 'Visible background for images with aspect ratio different to screen.')) diff --git a/openlp/plugins/media/lib/mediatab.py b/openlp/plugins/media/lib/mediatab.py index fcd899b0c..5b8fb7c2f 100644 --- a/openlp/plugins/media/lib/mediatab.py +++ b/openlp/plugins/media/lib/mediatab.py @@ -54,7 +54,7 @@ class MediaTab(SettingsTab): def retranslateUi(self): self.advanced_group_box.setTitle(UiStrings().Advanced) self.override_player_check_box.setText(translate('MediaPlugin.MediaTab', 'Allow media player to be overridden')) - self.auto_start_check_box.setText(translate('MediaPlugin.MediaTab', 'Start live items automatically')) + self.auto_start_check_box.setText(translate('MediaPlugin.MediaTab', 'Start Live items automatically')) def load(self): self.override_player_check_box.setChecked(Settings().value(self.settings_section + '/override player')) diff --git a/openlp/plugins/presentations/lib/presentationtab.py b/openlp/plugins/presentations/lib/presentationtab.py index 62c94832b..6b477454a 100644 --- a/openlp/plugins/presentations/lib/presentationtab.py +++ b/openlp/plugins/presentations/lib/presentationtab.py @@ -125,11 +125,11 @@ class PresentationTab(SettingsTab): translate('PresentationPlugin.PresentationTab', 'Allow presentation application to be overridden')) self.ppt_slide_click_check_box.setText( translate('PresentationPlugin.PresentationTab', - 'Clicking on current slide in live advances to the next effect')) + 'Clicking on current slide in Live advances to the next effect')) self.ppt_window_check_box.setText( translate('PresentationPlugin.PresentationTab', - 'Let PowerPoint control the size and position of the presentation window ' - '(workaround for Windows 8 scaling issue)')) + 'Let PowerPoint control the size and monitor of the presentations\n' + '(This may fixes PowerPoint scaling issues in Windows)')) self.pdf_program_check_box.setText( translate('PresentationPlugin.PresentationTab', 'Use given full path for mudraw or ghostscript binary:')) diff --git a/openlp/plugins/songs/lib/songstab.py b/openlp/plugins/songs/lib/songstab.py index 5a8c18a50..ef2ce0605 100644 --- a/openlp/plugins/songs/lib/songstab.py +++ b/openlp/plugins/songs/lib/songstab.py @@ -68,10 +68,10 @@ class SongsTab(SettingsTab): def retranslateUi(self): self.mode_group_box.setTitle(translate('SongsPlugin.SongsTab', 'Songs Mode')) self.tool_bar_active_check_box.setText(translate('SongsPlugin.SongsTab', - 'Display verses on live tool bar')) - self.update_on_edit_check_box.setText(translate('SongsPlugin.SongsTab', 'Update service from song edit')) + 'Enable "Go to verse" button in Live panel')) + self.update_on_edit_check_box.setText(translate('SongsPlugin.SongsTab', 'Update Service from song edit')) self.add_from_service_check_box.setText(translate('SongsPlugin.SongsTab', - 'Import missing songs from service files')) + 'Import missing songs from Service files')) self.display_songbook_check_box.setText(translate('SongsPlugin.SongsTab', 'Display songbook in footer')) self.display_copyright_check_box.setText(translate('SongsPlugin.SongsTab', 'Display "%s" symbol before copyright info') % From cc9f89bfdb6f43921afe163a37ea7ade8e0c98dc Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Wed, 13 Apr 2016 19:49:30 +0300 Subject: [PATCH 11/18] Splitted mail adress away expection error text, now inserting it with %s --- openlp/core/ui/exceptiondialog.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/openlp/core/ui/exceptiondialog.py b/openlp/core/ui/exceptiondialog.py index bad89f2ca..9a2e3acbd 100644 --- a/openlp/core/ui/exceptiondialog.py +++ b/openlp/core/ui/exceptiondialog.py @@ -90,6 +90,8 @@ class Ui_ExceptionDialog(object): """ Translate the widgets on the fly. """ + # Note that bugs_mail is not clicable, but it adds the blue color and underlining and makes the test copyable. + bugs_mail = ' bugs@openlp.org' exception_dialog.setWindowTitle(translate('OpenLP.ExceptionDialog', 'Error Occurred')) self.description_explanation.setText( translate('OpenLP.ExceptionDialog', 'Please describe what you were trying to do. ' @@ -97,13 +99,12 @@ class Ui_ExceptionDialog(object): self.message_label.setText( translate('OpenLP.ExceptionDialog', 'Oops, OpenLP hit a problem ' 'and couldn\'t recover!

' - 'You can help OpenLP developers to fix this by
' - 'sending them a bug report ' - 'to bugs@openlp.org

' + 'You can help OpenLP developers to fix this by
' + 'sending them a bug report to %s

' 'No email app? You can save this ' 'information to a file and
' 'send it from your mail on browser via an attachement.

' - 'Thank you for being part of making OpenLP better!')) + 'Thank you for being part of making OpenLP better!
') % bugs_mail) self.send_report_button.setText(translate('OpenLP.ExceptionDialog', 'Send E-Mail')) self.save_report_button.setText(translate('OpenLP.ExceptionDialog', 'Save to File')) self.attach_tile_button.setText(translate('OpenLP.ExceptionDialog', 'Attach File')) From e4bce11a0305b283ab5a1bb879ee49ad1e4ceb52 Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Tue, 10 May 2016 03:53:14 +0300 Subject: [PATCH 12/18] Commiting for merging trunk, some new changes. --- openlp/core/common/uistrings.py | 1 + openlp/core/ui/exceptiondialog.py | 7 ++++--- openlp/plugins/bibles/lib/mediaitem.py | 6 +++--- openlp/plugins/images/imageplugin.py | 2 +- openlp/plugins/images/lib/mediaitem.py | 6 +++--- openlp/plugins/media/lib/mediatab.py | 2 +- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/openlp/core/common/uistrings.py b/openlp/core/common/uistrings.py index f5d0514cb..15cb67f27 100644 --- a/openlp/core/common/uistrings.py +++ b/openlp/core/common/uistrings.py @@ -52,6 +52,7 @@ class UiStrings(object): self.About = translate('OpenLP.Ui', 'About') self.Add = translate('OpenLP.Ui', '&Add') self.AddGroup = translate('OpenLP.Ui', 'Add group') + self.AddGroupDot = translate('OpenLP.Ui', 'Add group.') self.Advanced = translate('OpenLP.Ui', 'Advanced') self.AllFiles = translate('OpenLP.Ui', 'All Files') self.Automatic = translate('OpenLP.Ui', 'Automatic') diff --git a/openlp/core/ui/exceptiondialog.py b/openlp/core/ui/exceptiondialog.py index 9a2e3acbd..1782374ce 100644 --- a/openlp/core/ui/exceptiondialog.py +++ b/openlp/core/ui/exceptiondialog.py @@ -91,8 +91,8 @@ class Ui_ExceptionDialog(object): Translate the widgets on the fly. """ # Note that bugs_mail is not clicable, but it adds the blue color and underlining and makes the test copyable. - bugs_mail = ' bugs@openlp.org' exception_dialog.setWindowTitle(translate('OpenLP.ExceptionDialog', 'Error Occurred')) + # Explanation text,   adds a small space before: If possible, write in English. self.description_explanation.setText( translate('OpenLP.ExceptionDialog', 'Please describe what you were trying to do. ' ' If possible, write in English.')) @@ -100,11 +100,12 @@ class Ui_ExceptionDialog(object): translate('OpenLP.ExceptionDialog', 'Oops, OpenLP hit a problem ' 'and couldn\'t recover!

' 'You can help OpenLP developers to fix this by
' - 'sending them a bug report to %s

' + 'sending them a bug report to {email}

' 'No email app? You can save this ' 'information to a file and
' 'send it from your mail on browser via an attachement.

' - 'Thank you for being part of making OpenLP better!
') % bugs_mail) + 'Thank you for being part of making OpenLP better!
' + ).format(email=' bugs@openlp.org')) self.send_report_button.setText(translate('OpenLP.ExceptionDialog', 'Send E-Mail')) self.save_report_button.setText(translate('OpenLP.ExceptionDialog', 'Save to File')) self.attach_tile_button.setText(translate('OpenLP.ExceptionDialog', 'Attach File')) diff --git a/openlp/plugins/bibles/lib/mediaitem.py b/openlp/plugins/bibles/lib/mediaitem.py index 1d7b5a897..fb971fa00 100644 --- a/openlp/plugins/bibles/lib/mediaitem.py +++ b/openlp/plugins/bibles/lib/mediaitem.py @@ -186,7 +186,7 @@ class BibleMediaItem(MediaManagerItem): self.search_tab_bar.setObjectName('search_tab_bar') self.page_layout.addWidget(self.search_tab_bar) # Add the Quick Search tab. - self.add_search_tab('quick', translate('BiblesPlugin.MediaItem', 'Quick')) + self.add_search_tab('quick', translate('BiblesPlugin.MediaItem', 'Search')) self.quick_search_label = QtWidgets.QLabel(self.quickTab) self.quick_search_label.setObjectName('quick_search_label') self.quickLayout.addWidget(self.quick_search_label, 0, 0, QtCore.Qt.AlignRight) @@ -195,10 +195,10 @@ class BibleMediaItem(MediaManagerItem): self.quick_search_edit.setObjectName('quick_search_edit') self.quick_search_label.setBuddy(self.quick_search_edit) self.quickLayout.addWidget(self.quick_search_edit, 0, 1, 1, 2) - self.add_search_fields('quick', translate('BiblesPlugin.MediaItem', 'Quick')) + self.add_search_fields('quick', translate('BiblesPlugin.MediaItem', 'Search')) self.quickTab.setVisible(True) # Add the Advanced Search tab. - self.add_search_tab('advanced', translate('BiblesPlugin.MediaItem', 'Advanced')) + self.add_search_tab('advanced', translate('BiblesPlugin.MediaItem', 'Select')) self.advanced_book_label = QtWidgets.QLabel(self.advancedTab) self.advanced_book_label.setObjectName('advanced_book_label') self.advancedLayout.addWidget(self.advanced_book_label, 0, 0, QtCore.Qt.AlignRight) diff --git a/openlp/plugins/images/imageplugin.py b/openlp/plugins/images/imageplugin.py index 26cba5a20..bf4c04e40 100644 --- a/openlp/plugins/images/imageplugin.py +++ b/openlp/plugins/images/imageplugin.py @@ -88,7 +88,7 @@ class ImagePlugin(Plugin): self.text_strings[StringContent.VisibleName] = {'title': translate('ImagePlugin', 'Images', 'container title')} # Middle Header Bar tooltips = { - 'load': translate('ImagePlugin', 'Load a new image.'), + 'load': translate('ImagePlugin', 'Add new image(s).'), 'import': '', 'new': translate('ImagePlugin', 'Add a new image.'), 'edit': translate('ImagePlugin', 'Edit the selected image.'), diff --git a/openlp/plugins/images/lib/mediaitem.py b/openlp/plugins/images/lib/mediaitem.py index f35fd48c7..ce7f1c566 100644 --- a/openlp/plugins/images/lib/mediaitem.py +++ b/openlp/plugins/images/lib/mediaitem.py @@ -74,8 +74,8 @@ class ImageMediaItem(MediaManagerItem): self.on_new_prompt = translate('ImagePlugin.MediaItem', 'Select Image(s)') file_formats = get_images_filter() self.on_new_file_masks = '%s;;%s (*)' % (file_formats, UiStrings().AllFiles) - self.add_group_action.setText(UiStrings().AddGroup) - self.add_group_action.setToolTip(UiStrings().AddGroup) + self.add_group_action.setText(UiStrings().AddGroupDot) + self.add_group_action.setToolTip(UiStrings().AddGroupDot) self.replace_action.setText(UiStrings().ReplaceBG) self.replace_action.setToolTip(UiStrings().ReplaceLiveBG) self.reset_action.setText(UiStrings().ResetBG) @@ -179,7 +179,7 @@ class ImageMediaItem(MediaManagerItem): text=UiStrings().AddGroup, icon=':/images/image_new_group.png', triggers=self.on_add_group_click) create_widget_action( self.list_view, - text=self.plugin.get_string(StringContent.Load)['tooltip'], + text=translate('ImagePlugin', 'Add new image(s)'), icon=':/general/general_open.png', triggers=self.on_file_click) def add_start_header_bar(self): diff --git a/openlp/plugins/media/lib/mediatab.py b/openlp/plugins/media/lib/mediatab.py index 5b8fb7c2f..5944d39cf 100644 --- a/openlp/plugins/media/lib/mediatab.py +++ b/openlp/plugins/media/lib/mediatab.py @@ -54,7 +54,7 @@ class MediaTab(SettingsTab): def retranslateUi(self): self.advanced_group_box.setTitle(UiStrings().Advanced) self.override_player_check_box.setText(translate('MediaPlugin.MediaTab', 'Allow media player to be overridden')) - self.auto_start_check_box.setText(translate('MediaPlugin.MediaTab', 'Start Live items automatically')) + self.auto_start_check_box.setText(translate('MediaPlugin.MediaTab', 'Start videos Live items automatically')) def load(self): self.override_player_check_box.setChecked(Settings().value(self.settings_section + '/override player')) From d7f3e4a9f280e3b53b0de0a0f54ef09d76c71873 Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Tue, 10 May 2016 04:11:49 +0300 Subject: [PATCH 13/18] Lowercapped some settings. --- openlp/core/ui/generaltab.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index 0b2e1df08..884e95900 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -246,7 +246,7 @@ class GeneralTab(SettingsTab): self.display_on_monitor_check.setText(translate('OpenLP.GeneralTab', 'Display if a single screen')) self.startup_group_box.setTitle(translate('OpenLP.GeneralTab', 'Application Startup')) self.warning_check_box.setText(translate('OpenLP.GeneralTab', 'Show blank screen warning')) - self.auto_open_check_box.setText(translate('OpenLP.GeneralTab', 'Automatically open the last Service')) + self.auto_open_check_box.setText(translate('OpenLP.GeneralTab', 'Automatically open the previous service file')) self.show_splash_check_box.setText(translate('OpenLP.GeneralTab', 'Show the splash screen')) self.logo_group_box.setTitle(translate('OpenLP.GeneralTab', 'Logo')) self.logo_color_label.setText(UiStrings().BackgroundColorColon) From 77e9e1ad27dbc3d486b06de56f4229d07f2844cb Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Tue, 10 May 2016 04:55:26 +0300 Subject: [PATCH 14/18] Lowercapped bunch of stuff, splitted expection error --- openlp/core/ui/advancedtab.py | 8 ++++---- openlp/core/ui/exceptiondialog.py | 16 +++++++++------- openlp/core/ui/exceptionform.py | 3 ++- openlp/core/ui/generaltab.py | 4 ++-- openlp/core/ui/mainwindow.py | 2 +- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/openlp/core/ui/advancedtab.py b/openlp/core/ui/advancedtab.py index 8c7fbdce1..b12b60d4f 100644 --- a/openlp/core/ui/advancedtab.py +++ b/openlp/core/ui/advancedtab.py @@ -294,7 +294,7 @@ class AdvancedTab(SettingsTab): self.enable_auto_close_check_box.setText(translate('OpenLP.AdvancedTab', 'Enable application exit confirmation')) self.service_name_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Default Service Name')) - self.service_name_check_box.setText(translate('OpenLP.AdvancedTab', 'Enable default Service name')) + self.service_name_check_box.setText(translate('OpenLP.AdvancedTab', 'Enable default service name')) self.service_name_time_label.setText(translate('OpenLP.AdvancedTab', 'Date and Time:')) self.service_name_day.setItemText(0, translate('OpenLP.AdvancedTab', 'Monday')) self.service_name_day.setItemText(1, translate('OpenLP.AdvancedTab', 'Tuesday')) @@ -304,11 +304,11 @@ class AdvancedTab(SettingsTab): self.service_name_day.setItemText(5, translate('OpenLP.AdvancedTab', 'Saturday')) self.service_name_day.setItemText(6, translate('OpenLP.AdvancedTab', 'Sunday')) self.service_name_day.setItemText(7, translate('OpenLP.AdvancedTab', 'Now')) - self.service_name_time.setToolTip(translate('OpenLP.AdvancedTab', 'Time when usual Service starts.')) + self.service_name_time.setToolTip(translate('OpenLP.AdvancedTab', 'Time when usual service starts.')) self.service_name_label.setText(translate('OpenLP.AdvancedTab', 'Name:')) self.service_name_edit.setToolTip(translate('OpenLP.AdvancedTab', 'Consult the OpenLP manual for usage.')) self.service_name_revert_button.setToolTip( - translate('OpenLP.AdvancedTab', 'Revert to the default Service name "%s".') % + translate('OpenLP.AdvancedTab', 'Revert to the default service name "%s".') % UiStrings().DefaultServiceName) self.service_name_example_label.setText(translate('OpenLP.AdvancedTab', 'Example:')) self.hide_mouse_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Mouse Cursor')) @@ -336,7 +336,7 @@ class AdvancedTab(SettingsTab): self.slide_label.setText(translate('OpenLP.GeneralTab', 'Behavior of next/previous on the last/first slide:')) self.end_slide_radio_button.setText(translate('OpenLP.GeneralTab', '&Remain on Slide')) self.wrap_slide_radio_button.setText(translate('OpenLP.GeneralTab', '&Wrap around')) - self.next_item_radio_button.setText(translate('OpenLP.GeneralTab', '&Move to next/previous Service item')) + self.next_item_radio_button.setText(translate('OpenLP.GeneralTab', '&Move to next/previous service item')) self.search_as_type_check_box.setText(translate('SongsPlugin.GeneralTab', 'Enable search as you type')) def load(self): diff --git a/openlp/core/ui/exceptiondialog.py b/openlp/core/ui/exceptiondialog.py index 1782374ce..5a4523ade 100644 --- a/openlp/core/ui/exceptiondialog.py +++ b/openlp/core/ui/exceptiondialog.py @@ -90,22 +90,24 @@ class Ui_ExceptionDialog(object): """ Translate the widgets on the fly. """ - # Note that bugs_mail is not clicable, but it adds the blue color and underlining and makes the test copyable. - exception_dialog.setWindowTitle(translate('OpenLP.ExceptionDialog', 'Error Occurred')) + # Note that bugs mail is not clicable, but it adds the blue color and underlining and makes the test copyable. + #exception_dialog.setWindowTitle(translate('OpenLP.ExceptionDialog', 'Error Occurred')) # Explanation text,   adds a small space before: If possible, write in English. self.description_explanation.setText( translate('OpenLP.ExceptionDialog', 'Please describe what you were trying to do. ' ' If possible, write in English.')) + expection_part1 = (translate('OpenLP.ExceptionDialog', + 'Oops, OpenLP hit a problem and couldn\'t recover!

You can ' + 'help OpenLP developers to fix this by
sending them a ' + 'bug report to {email}

' + ).format(email=' bugs@openlp.org')) self.message_label.setText( - translate('OpenLP.ExceptionDialog', 'Oops, OpenLP hit a problem ' - 'and couldn\'t recover!

' - 'You can help OpenLP developers to fix this by
' - 'sending them a bug report to {email}

' + translate('OpenLP.ExceptionDialog', '{first_part}' 'No email app? You can save this ' 'information to a file and
' 'send it from your mail on browser via an attachement.

' 'Thank you for being part of making OpenLP better!
' - ).format(email=' bugs@openlp.org')) + ).format(first_part = expection_part1)) self.send_report_button.setText(translate('OpenLP.ExceptionDialog', 'Send E-Mail')) self.save_report_button.setText(translate('OpenLP.ExceptionDialog', 'Save to File')) self.attach_tile_button.setText(translate('OpenLP.ExceptionDialog', 'Attach File')) diff --git a/openlp/core/ui/exceptionform.py b/openlp/core/ui/exceptionform.py index 6430423cf..7df0d695f 100644 --- a/openlp/core/ui/exceptionform.py +++ b/openlp/core/ui/exceptionform.py @@ -199,7 +199,8 @@ class ExceptionForm(QtWidgets.QDialog, Ui_ExceptionDialog, RegistryProperties): else: self.__button_state(False) self.description_word_count.setText( - translate('OpenLP.ExceptionDialog', '%s Characters from the minimum description remaining.') % count) + translate('OpenLP.ExceptionDialog', '{count} characters from the minimum description remaining.' + ).format(count = count)) def on_attach_file_button_clicked(self): """ diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index 884e95900..5173f315b 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -257,10 +257,10 @@ class GeneralTab(SettingsTab): self.check_for_updates_check_box.setText(translate('OpenLP.GeneralTab', 'Check for updates to OpenLP')) self.settings_group_box.setTitle(translate('OpenLP.GeneralTab', 'Application Settings')) self.save_check_service_check_box.setText(translate('OpenLP.GeneralTab', - 'Prompt to save before starting a new Service')) + 'Prompt to save before starting a new service')) self.auto_unblank_check_box.setText(translate('OpenLP.GeneralTab', 'Unblank display when adding new Live item')) self.auto_preview_check_box.setText(translate('OpenLP.GeneralTab', - 'Automatically preview next item in Service')) + 'Automatically preview the next item in service')) self.timeout_label.setText(translate('OpenLP.GeneralTab', 'Timed slide interval:')) self.timeout_spin_box.setSuffix(translate('OpenLP.GeneralTab', ' sec')) self.ccli_group_box.setTitle(translate('OpenLP.GeneralTab', 'CCLI Details')) diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 57c67c66e..db1636518 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -442,7 +442,7 @@ class Ui_MainWindow(object): self.view_media_manager_item.setStatusTip(translate('OpenLP.MainWindow', 'Toggle the visibility of the Library.')) self.view_theme_manager_item.setText(translate('OpenLP.MainWindow', '&Themes')) - self.view_theme_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Themes')) + self.view_theme_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show themes')) self.view_theme_manager_item.setStatusTip(translate('OpenLP.MainWindow', 'Toggle the visibility of the Themes.')) self.view_service_manager_item.setText(translate('OpenLP.MainWindow', '&Service')) From 46e7ad4983363394faba181c62cbf511b0ca6458 Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Tue, 10 May 2016 14:06:00 +0300 Subject: [PATCH 15/18] - Changes based on comments by TRB143 --- openlp/core/common/uistrings.py | 4 ++-- openlp/core/ui/exceptiondialog.py | 13 +++++++------ openlp/core/ui/slidecontroller.py | 2 +- openlp/core/ui/themewizard.py | 10 +++++----- openlp/plugins/alerts/lib/alertstab.py | 4 ++-- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/openlp/core/common/uistrings.py b/openlp/core/common/uistrings.py index 15cb67f27..fa01a44d2 100644 --- a/openlp/core/common/uistrings.py +++ b/openlp/core/common/uistrings.py @@ -82,7 +82,7 @@ class UiStrings(object): self.File = translate('OpenLP.Ui', 'File') self.FileNotFound = translate('OpenLP.Ui', 'File Not Found') self.FileNotFoundMessage = translate('OpenLP.Ui', 'File %s not found.\nPlease try selecting it individually.') - self.FontSizePtUnit = translate('OpenLP.Ui', ' pt', 'Abbreviated font pointsize unit') + self.FontSizePtUnit = translate('OpenLP.Ui', 'pt', 'Abbreviated font pointsize unit') self.Help = translate('OpenLP.Ui', 'Help') self.Hours = translate('OpenLP.Ui', 'h', 'The abbreviated unit for hours') self.IFdSs = translate('OpenLP.Ui', 'Invalid Folder Selected', 'Singular') @@ -128,7 +128,7 @@ class UiStrings(object): 'player is disabled.') self.ResetBG = translate('OpenLP.Ui', 'Reset Background') self.ResetLiveBG = translate('OpenLP.Ui', 'Reset live background.') - self.Seconds = translate('OpenLP.Ui', ' s', 'The abbreviated unit for seconds') + self.Seconds = translate('OpenLP.Ui', 's', 'The abbreviated unit for seconds') self.SaveAndPreview = translate('OpenLP.Ui', 'Save && Preview') self.Search = translate('OpenLP.Ui', 'Search') self.SearchThemes = translate('OpenLP.Ui', 'Search Themes...', 'Search bar place holder text ') diff --git a/openlp/core/ui/exceptiondialog.py b/openlp/core/ui/exceptiondialog.py index 5a4523ade..64cbdefa8 100644 --- a/openlp/core/ui/exceptiondialog.py +++ b/openlp/core/ui/exceptiondialog.py @@ -96,18 +96,19 @@ class Ui_ExceptionDialog(object): self.description_explanation.setText( translate('OpenLP.ExceptionDialog', 'Please describe what you were trying to do. ' ' If possible, write in English.')) - expection_part1 = (translate('OpenLP.ExceptionDialog', - 'Oops, OpenLP hit a problem and couldn\'t recover!

You can ' - 'help OpenLP developers to fix this by
sending them a ' - 'bug report to {email}

' - ).format(email=' bugs@openlp.org')) + exception_part1 = (translate('OpenLP.ExceptionDialog', + 'Oops, OpenLP hit a problem and couldn\'t recover!

' + 'You can help the OpenLP developers to fix this' + ' by
sending them a bug report to {email}{newlines}' + ).format(email=' bugs@openlp.org', + newlines='

')) self.message_label.setText( translate('OpenLP.ExceptionDialog', '{first_part}' 'No email app? You can save this ' 'information to a file and
' 'send it from your mail on browser via an attachement.

' 'Thank you for being part of making OpenLP better!
' - ).format(first_part = expection_part1)) + ).format(first_part = exception_part1)) self.send_report_button.setText(translate('OpenLP.ExceptionDialog', 'Send E-Mail')) self.save_report_button.setText(translate('OpenLP.ExceptionDialog', 'Save to File')) self.attach_tile_button.setText(translate('OpenLP.ExceptionDialog', 'Attach File')) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index ea2abe5fb..228873d9b 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -290,7 +290,7 @@ class SlideController(DisplayController, RegistryProperties): self.delay_spin_box = QtWidgets.QSpinBox() self.delay_spin_box.setObjectName('delay_spin_box') self.delay_spin_box.setRange(1, 180) - self.delay_spin_box.setSuffix(UiStrings().Seconds) + self.delay_spin_box.setSuffix(' {unit}'.format(unit=UiStrings().Seconds)) self.delay_spin_box.setToolTip(translate('OpenLP.SlideController', 'Delay between slides in seconds.')) self.receive_spin_delay() self.toolbar.add_toolbar_widget(self.delay_spin_box) diff --git a/openlp/core/ui/themewizard.py b/openlp/core/ui/themewizard.py index ab8854ef2..51a7a6a5b 100644 --- a/openlp/core/ui/themewizard.py +++ b/openlp/core/ui/themewizard.py @@ -419,15 +419,15 @@ class Ui_ThemeWizard(object): self.main_font_label.setText(translate('OpenLP.ThemeWizard', 'Font:')) self.main_color_label.setText(translate('OpenLP.ThemeWizard', 'color:')) self.main_size_label.setText(translate('OpenLP.ThemeWizard', 'Size:')) - self.main_size_spin_box.setSuffix(UiStrings().FontSizePtUnit) + self.main_size_spin_box.setSuffix(' {unit}'.format(unit=UiStrings().FontSizePtUnit)) self.line_spacing_label.setText(translate('OpenLP.ThemeWizard', 'Line Spacing:')) - self.line_spacing_spin_box.setSuffix(UiStrings().FontSizePtUnit) + self.line_spacing_spin_box.setSuffix(' {unit}'.format(unit=UiStrings().FontSizePtUnit)) self.outline_check_box.setText(translate('OpenLP.ThemeWizard', '&Outline:')) self.outline_size_label.setText(translate('OpenLP.ThemeWizard', 'Size:')) - self.outline_size_spin_box.setSuffix(UiStrings().FontSizePtUnit) + self.outline_size_spin_box.setSuffix(' {unit}'.format(unit=UiStrings().FontSizePtUnit)) self.shadow_check_box.setText(translate('OpenLP.ThemeWizard', '&Shadow:')) self.shadow_size_label.setText(translate('OpenLP.ThemeWizard', 'Size:')) - self.shadow_size_spin_box.setSuffix(UiStrings().FontSizePtUnit) + self.shadow_size_spin_box.setSuffix(' {unit}'.format(unit=UiStrings().FontSizePtUnit)) self.main_bold_check_box.setText(translate('OpenLP.ThemeWizard', 'Bold')) self.main_italics_check_box.setText(translate('OpenLP.ThemeWizard', 'Italic')) self.footer_area_page.setTitle(translate('OpenLP.ThemeWizard', 'Footer Area Font Details')) @@ -436,7 +436,7 @@ class Ui_ThemeWizard(object): self.footer_font_label.setText(translate('OpenLP.ThemeWizard', 'Font:')) self.footer_color_label.setText(translate('OpenLP.ThemeWizard', 'color:')) self.footer_size_label.setText(translate('OpenLP.ThemeWizard', 'Size:')) - self.footer_size_spin_box.setSuffix(UiStrings().FontSizePtUnit) + self.footer_size_spin_box.setSuffix(' {unit}'.format(unit=UiStrings().FontSizePtUnit)) self.alignment_page.setTitle(translate('OpenLP.ThemeWizard', 'Text Formatting Details')) self.alignment_page.setSubTitle(translate('OpenLP.ThemeWizard', 'Allows additional display ' 'formatting information to be defined')) diff --git a/openlp/plugins/alerts/lib/alertstab.py b/openlp/plugins/alerts/lib/alertstab.py index e1698dbc4..bc6ae6426 100644 --- a/openlp/plugins/alerts/lib/alertstab.py +++ b/openlp/plugins/alerts/lib/alertstab.py @@ -101,9 +101,9 @@ class AlertsTab(SettingsTab): self.font_color_label.setText(translate('AlertsPlugin.AlertsTab', 'Font color:')) self.background_color_label.setText(UiStrings().BackgroundColorColon) self.font_size_label.setText(translate('AlertsPlugin.AlertsTab', 'Font size:')) - self.font_size_spin_box.setSuffix(UiStrings().FontSizePtUnit) + self.font_size_spin_box.setSuffix(' {unit}'.format(unit=UiStrings().FontSizePtUnit)) self.timeout_label.setText(translate('AlertsPlugin.AlertsTab', 'Alert timeout:')) - self.timeout_spin_box.setSuffix(UiStrings().Seconds) + self.timeout_spin_box.setSuffix(' {unit}'.format(unit=UiStrings().Seconds)) self.preview_group_box.setTitle(UiStrings().Preview) self.font_preview.setText(UiStrings().OLPV2x) From 524adae71f1d9f0814944f339133b328e8afe8c9 Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Tue, 10 May 2016 14:13:41 +0300 Subject: [PATCH 16/18] - Pep8 fixes --- openlp/core/ui/exceptiondialog.py | 4 ++-- openlp/core/ui/exceptionform.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openlp/core/ui/exceptiondialog.py b/openlp/core/ui/exceptiondialog.py index 64cbdefa8..443c22bd8 100644 --- a/openlp/core/ui/exceptiondialog.py +++ b/openlp/core/ui/exceptiondialog.py @@ -91,7 +91,7 @@ class Ui_ExceptionDialog(object): Translate the widgets on the fly. """ # Note that bugs mail is not clicable, but it adds the blue color and underlining and makes the test copyable. - #exception_dialog.setWindowTitle(translate('OpenLP.ExceptionDialog', 'Error Occurred')) + exception_dialog.setWindowTitle(translate('OpenLP.ExceptionDialog', 'Error Occurred')) # Explanation text,   adds a small space before: If possible, write in English. self.description_explanation.setText( translate('OpenLP.ExceptionDialog', 'Please describe what you were trying to do. ' @@ -108,7 +108,7 @@ class Ui_ExceptionDialog(object): 'information to a file and
' 'send it from your mail on browser via an attachement.

' 'Thank you for being part of making OpenLP better!
' - ).format(first_part = exception_part1)) + ).format(first_part=exception_part1)) self.send_report_button.setText(translate('OpenLP.ExceptionDialog', 'Send E-Mail')) self.save_report_button.setText(translate('OpenLP.ExceptionDialog', 'Save to File')) self.attach_tile_button.setText(translate('OpenLP.ExceptionDialog', 'Attach File')) diff --git a/openlp/core/ui/exceptionform.py b/openlp/core/ui/exceptionform.py index 7df0d695f..9213cf072 100644 --- a/openlp/core/ui/exceptionform.py +++ b/openlp/core/ui/exceptionform.py @@ -200,7 +200,7 @@ class ExceptionForm(QtWidgets.QDialog, Ui_ExceptionDialog, RegistryProperties): self.__button_state(False) self.description_word_count.setText( translate('OpenLP.ExceptionDialog', '{count} characters from the minimum description remaining.' - ).format(count = count)) + ).format(count=count)) def on_attach_file_button_clicked(self): """ From 0c8503a26609cbc668a20714d6948ca499054804 Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Sun, 24 Jul 2016 22:58:34 +0300 Subject: [PATCH 17/18] - Changed stuff based on comments by TRB143. --- openlp/core/ui/advancedtab.py | 2 +- openlp/core/ui/exceptionform.py | 2 +- openlp/core/ui/generaltab.py | 3 ++- openlp/plugins/media/lib/mediatab.py | 2 +- openlp/plugins/presentations/lib/presentationtab.py | 4 ++-- openlp/plugins/songs/lib/songstab.py | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/openlp/core/ui/advancedtab.py b/openlp/core/ui/advancedtab.py index b12b60d4f..6201067fb 100644 --- a/openlp/core/ui/advancedtab.py +++ b/openlp/core/ui/advancedtab.py @@ -252,7 +252,7 @@ class AdvancedTab(SettingsTab): self.tab_title_visible = UiStrings().Advanced self.ui_group_box.setTitle(translate('OpenLP.AdvancedTab', 'UI Settings')) self.data_directory_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Data Location')) - self.recent_label.setText(translate('OpenLP.AdvancedTab', 'Number of recent Service files to display:')) + self.recent_label.setText(translate('OpenLP.AdvancedTab', 'Number of recent service files to display:')) self.media_plugin_check_box.setText(translate('OpenLP.AdvancedTab', 'Open the last used Library category on startup')) self.double_click_live_check_box.setText(translate('OpenLP.AdvancedTab', diff --git a/openlp/core/ui/exceptionform.py b/openlp/core/ui/exceptionform.py index 9213cf072..c88cf9ef8 100644 --- a/openlp/core/ui/exceptionform.py +++ b/openlp/core/ui/exceptionform.py @@ -199,7 +199,7 @@ class ExceptionForm(QtWidgets.QDialog, Ui_ExceptionDialog, RegistryProperties): else: self.__button_state(False) self.description_word_count.setText( - translate('OpenLP.ExceptionDialog', '{count} characters from the minimum description remaining.' + translate('OpenLP.ExceptionDialog', '{count} characters remaining from the minimum description.' ).format(count=count)) def on_attach_file_button_clicked(self): diff --git a/openlp/core/ui/generaltab.py b/openlp/core/ui/generaltab.py index 5173f315b..08592b49a 100644 --- a/openlp/core/ui/generaltab.py +++ b/openlp/core/ui/generaltab.py @@ -258,7 +258,8 @@ class GeneralTab(SettingsTab): self.settings_group_box.setTitle(translate('OpenLP.GeneralTab', 'Application Settings')) self.save_check_service_check_box.setText(translate('OpenLP.GeneralTab', 'Prompt to save before starting a new service')) - self.auto_unblank_check_box.setText(translate('OpenLP.GeneralTab', 'Unblank display when adding new Live item')) + self.auto_unblank_check_box.setText(translate('OpenLP.GeneralTab', 'Unblank display when sending ' + 'items to Live')) self.auto_preview_check_box.setText(translate('OpenLP.GeneralTab', 'Automatically preview the next item in service')) self.timeout_label.setText(translate('OpenLP.GeneralTab', 'Timed slide interval:')) diff --git a/openlp/plugins/media/lib/mediatab.py b/openlp/plugins/media/lib/mediatab.py index 5944d39cf..0e00ec82b 100644 --- a/openlp/plugins/media/lib/mediatab.py +++ b/openlp/plugins/media/lib/mediatab.py @@ -54,7 +54,7 @@ class MediaTab(SettingsTab): def retranslateUi(self): self.advanced_group_box.setTitle(UiStrings().Advanced) self.override_player_check_box.setText(translate('MediaPlugin.MediaTab', 'Allow media player to be overridden')) - self.auto_start_check_box.setText(translate('MediaPlugin.MediaTab', 'Start videos Live items automatically')) + self.auto_start_check_box.setText(translate('MediaPlugin.MediaTab', 'Start new Live media automatically')) def load(self): self.override_player_check_box.setChecked(Settings().value(self.settings_section + '/override player')) diff --git a/openlp/plugins/presentations/lib/presentationtab.py b/openlp/plugins/presentations/lib/presentationtab.py index b7001c18e..efdcb0eb1 100644 --- a/openlp/plugins/presentations/lib/presentationtab.py +++ b/openlp/plugins/presentations/lib/presentationtab.py @@ -125,11 +125,11 @@ class PresentationTab(SettingsTab): translate('PresentationPlugin.PresentationTab', 'Allow presentation application to be overridden')) self.ppt_slide_click_check_box.setText( translate('PresentationPlugin.PresentationTab', - 'Clicking on current slide in Live advances to the next effect')) + 'Clicking on current slide advances to the next effect')) self.ppt_window_check_box.setText( translate('PresentationPlugin.PresentationTab', 'Let PowerPoint control the size and monitor of the presentations\n' - '(This may fixes PowerPoint scaling issues in Windows)')) + '(This may fixes PowerPoint scaling issues in Windows 8 and 10)')) self.pdf_program_check_box.setText( translate('PresentationPlugin.PresentationTab', 'Use given full path for mudraw or ghostscript binary:')) diff --git a/openlp/plugins/songs/lib/songstab.py b/openlp/plugins/songs/lib/songstab.py index ef2ce0605..711e096a5 100644 --- a/openlp/plugins/songs/lib/songstab.py +++ b/openlp/plugins/songs/lib/songstab.py @@ -69,7 +69,7 @@ class SongsTab(SettingsTab): self.mode_group_box.setTitle(translate('SongsPlugin.SongsTab', 'Songs Mode')) self.tool_bar_active_check_box.setText(translate('SongsPlugin.SongsTab', 'Enable "Go to verse" button in Live panel')) - self.update_on_edit_check_box.setText(translate('SongsPlugin.SongsTab', 'Update Service from song edit')) + self.update_on_edit_check_box.setText(translate('SongsPlugin.SongsTab', 'Update service from song edit')) self.add_from_service_check_box.setText(translate('SongsPlugin.SongsTab', 'Import missing songs from Service files')) self.display_songbook_check_box.setText(translate('SongsPlugin.SongsTab', 'Display songbook in footer')) From e9d53fd3d9acf92f0c9da1115b234560f95e840d Mon Sep 17 00:00:00 2001 From: suutari-olli Date: Sun, 24 Jul 2016 23:25:23 +0300 Subject: [PATCH 18/18] - Changed Remote web page titles from OpenLP | x to x | OpenLP --- openlp/plugins/remotes/lib/httprouter.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openlp/plugins/remotes/lib/httprouter.py b/openlp/plugins/remotes/lib/httprouter.py index 5791146e6..38f9d9c35 100644 --- a/openlp/plugins/remotes/lib/httprouter.py +++ b/openlp/plugins/remotes/lib/httprouter.py @@ -319,9 +319,9 @@ class HttpRouter(RegistryProperties): remote = translate('RemotePlugin.Mobile', 'Remote') stage = translate('RemotePlugin.Mobile', 'Stage') self.template_vars = { - 'app_title': "OpenLP | {remote}".format(remote=remote), - 'stage_title': "OpenLP | {stage}".format(stage=stage), - 'live_title': "OpenLP | {live}".format(live=UiStrings().Live), + 'app_title': "{remote} | OpenLP".format(remote=remote), + 'stage_title': "{stage} | OpenLP".format(stage=stage), + 'live_title': "{live} | OpenLP".format(live=UiStrings().Live), 'service_manager': translate('RemotePlugin.Mobile', 'Service Manager'), 'slide_controller': translate('RemotePlugin.Mobile', 'Slide Controller'), 'alerts': translate('RemotePlugin.Mobile', 'Alerts'),