I replied to the comments, I'll see if I can get the traceback sorted out later.
Diff comments:
> === modified file 'openlp/core/ui/advancedtab.py'
> --- openlp/core/ui/advancedtab.py 2016-04-05 17:30:20 +0000
> +++ openlp/core/ui/advancedtab.py 2016-04-12 13:30:46 +0000
> @@ -273,15 +273,15 @@
> 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'))
I think all references to panel names should be capitalized (Library, Service,
Live, Preview) But superfly suggested they should all be lowercaps due to our
string/translation standards.
>
> self.single_click_service_preview_check_box.setText(translate('OpenLP.AdvancedTab',
> -
> 'Preview items when clicked in Service Manager'))
> +
> 'Preview items when clicked in service'))
I think all references to panel names should be capitalized (Library, Service,
Live, Preview) But superfly suggested they should all be lowercaps due to our
string/translation standards.
>
> self.expand_service_item_check_box.setText(translate('OpenLP.AdvancedTab',
> 'Expand new
> service items on creation'))
> self.slide_max_height_label.setText(translate('OpenLP.AdvancedTab',
>
> === modified file 'openlp/core/ui/exceptiondialog.py'
> --- openlp/core/ui/exceptiondialog.py 2015-12-31 22:46:06 +0000
> +++ openlp/core/ui/exceptiondialog.py 2016-04-12 13:30:46 +0000
> @@ -90,15 +92,18 @@
> """
> 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', '<strong>Please describe
> what you were trying to do.</strong> '
> + ' 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 [email protected], 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', '<strong>Oops, OpenLP hit a
> problem '
> + 'and couldn\'t recover!</strong> <br><br>'
> + '<strong>You can help </strong> OpenLP developers to
> fix this by<br>'
> + 'sending them a <strong>bug report</strong> '
> + 'to <a href="mailto:[email protected]";> [email protected]
> </a> <br> <br>'
> + '<strong>No email app? </strong> You can
> <strong>save</strong> this '
> + 'information to a <strong>file</strong> and<br>'
> + 'send it from your <strong>mail on browser</strong>
> via an <strong>attachement.</strong><br><br>'
> + '<strong>Thank you<strong> for being part of making
> OpenLP better!'))
Will look into this later.
> 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'))
>
> === modified file 'openlp/core/ui/mainwindow.py'
> --- openlp/core/ui/mainwindow.py 2016-04-04 19:53:54 +0000
> +++ openlp/core/ui/mainwindow.py 2016-04-12 13:30:46 +0000
> @@ -416,7 +416,7 @@
> 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',
> 'Close OpenLP - Shut down the program.'))
Perhaphs "Close OpenLP." then.
All the tooltips should be full sentences and end with "." I feel like Close
OpenLP may not a complete sentence.
> 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 @@
> 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 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',
> '&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'))
There are now 4 items that start with L, it needs to be changed or they get all
messed up.
Honestly I don't think many people use these shortcuts instead of clicks and
those who do should have no problems adapting to this situation.
> + 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'))
>
> === modified file 'openlp/plugins/presentations/presentationplugin.py'
> --- openlp/plugins/presentations/presentationplugin.py 2016-01-08
> 13:47:52 +0000
> +++ openlp/plugins/presentations/presentationplugin.py 2016-04-12
> 13:30:46 +0000
> @@ -40,8 +40,8 @@
> 'presentations/enable_pdf_program':
> QtCore.Qt.Unchecked,
> 'presentations/pdf_program': '',
> 'presentations/Impress': QtCore.Qt.Checked,
> - 'presentations/Powerpoint': QtCore.Qt.Checked,
The problem is that it needs to be changed or the PowerPoint will remain typed
with Powerpoint. I think it would be better to change all Powerpoint s to
PowerPoint to avoid any trouble. Presentation settings are separated from
settings.py and have no entries there. Things seemed to work OK in Windows.
> - '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': '',
--
https://code.launchpad.net/~suutari-olli/openlp/ui-messages-part-1/+merge/291628
Your team OpenLP Core is subscribed to branch lp:openlp.
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
