openlp-core team mailing list archive

[Azaziah <suutari.olli@xxxxxxxxx>]

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

Diff comments:

> 
> === 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-10 00:27:48 +0000
> @@ -385,21 +385,21 @@
>          """
>          Set up the translation system
>          """
> -        main_window.setWindowTitle(UiStrings().OLPV2x)
> +        main_window.setWindowTitle(UiStrings().OLP)

Well I think this is irrelevant.
Version number can be still easily found from "About".

Are we OK with renaming this now?

>          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'))
>          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 @@
>          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.'))

"Done live it." What does that mean?

Leave OpenLP - may be better < I changed it to "Close OpenLP - ...
I feel like "Close is more commonly used".

>          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.'))

OK.

>          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 '

Added back the "OpenLP"

> +                                           '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'))
> @@ -943,7 +946,7 @@
>              self,
>              translate('OpenLP.MainWindow', 'Export Settings File'),
>              '',
> -            translate('OpenLP.MainWindow', 'OpenLP Export Settings File (*.conf)'))
> +            translate('OpenLP.MainWindow', 'Exported OpenLP Settings (.conf)'))

done.

>          if not export_file_name:
>              return
>              # Make sure it's a .conf file.
> 
> === modified file 'openlp/plugins/presentations/lib/presentationtab.py'
> --- openlp/plugins/presentations/lib/presentationtab.py	2015-12-31 22:46:06 +0000
> +++ openlp/plugins/presentations/lib/presentationtab.py	2016-04-10 00:27:48 +0000
> @@ -125,7 +125,7 @@
>              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.'))

I changed this to: Clicking on current slide in live advances to the next effect
We have the presentation in live and we are clicking the selected/current slide.

To me "Clicking on the live selected slide advances" Sounds like 
the word order is messed.

>          self.ppt_window_check_box.setText(
>              translate('PresentationPlugin.PresentationTab',
>                        'Let PowerPoint control the size and position of the presentation window '
> 
> === modified file 'openlp/plugins/remotes/lib/httprouter.py'
> --- openlp/plugins/remotes/lib/httprouter.py	2016-03-19 19:42:10 +0000
> +++ openlp/plugins/remotes/lib/httprouter.py	2016-04-10 00:27:48 +0000
> @@ -312,12 +312,11 @@
>          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')
>          self.template_vars = {
> -            'app_title': "%s %s" % (UiStrings().OLPV2x, remote),

These are the remote web page title names, how is version number relevant here?

> -            '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'),


-- 
https://code.launchpad.net/~suutari-olli/openlp/ui-messages-part-1/+merge/291447
Your team OpenLP Core is subscribed to branch lp:openlp.