openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #30170
Re: [Merge] lp:~suutari-olli/openlp/ui-messages-part-1 into lp:openlp
Replied to comments, fixed most of the stuff but added comment to period after image(s).
Diff comments:
>
> === modified file 'openlp/core/ui/advancedtab.py'
> --- openlp/core/ui/advancedtab.py 2016-06-01 04:15:43 +0000
> +++ openlp/core/ui/advancedtab.py 2016-08-02 20:20:09 +0000
> @@ -255,17 +255,17 @@
> 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'))
Fixed
> 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 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'))
> + 'Expand new Service items on creation'))
Fixed
> self.slide_max_height_label.setText(translate('OpenLP.AdvancedTab',
> 'Max height for non-text slides\nin slide controller:'))
> self.slide_max_height_combo_box.setItemText(0, translate('OpenLP.AdvancedTab', 'Disabled'))
>
> === 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-08-02 20:20:09 +0000
> @@ -88,17 +90,25 @@
> """
> 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'))
> + # Explanation text, adds a small space before: If possible, write in English.
> 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.'))
> + exception_part1 = (translate('OpenLP.ExceptionDialog',
> + '<strong>Oops, OpenLP hit a problem and couldn\'t recover!</strong> <br><br>'
> + '<strong>You can help </strong> the OpenLP developers to <strong>fix this</strong>'
> + ' by<br> sending them a <strong>bug report</strong> to {email}{newlines}'
> + ).format(email='<a href = "mailto:bugs@xxxxxxxxxx"; > bugs@xxxxxxxxxx</a>',
> + newlines='<br><br>'))
> 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@xxxxxxxxxx, 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', '{first_part}'
> + '<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>'
Fixed
> + '<strong>Thank you<strong> for being part of making OpenLP better!<br>'
> + ).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'))
>
> === modified file 'openlp/core/ui/exceptionform.py'
> --- openlp/core/ui/exceptionform.py 2016-07-01 21:17:20 +0000
> +++ openlp/core/ui/exceptionform.py 2016-08-02 20:20:09 +0000
> @@ -196,7 +196,8 @@
> else:
> self.__button_state(False)
> self.description_word_count.setText(
> - translate('OpenLP.ExceptionDialog', 'Description characters to enter : {count}').format(count=count))
> + translate('OpenLP.ExceptionDialog', '{count} characters remaining from the minimum description.'
> + ).format(count=count))
Fixed, added 3 UI-messages for empty, short and "full" desc.
>
> def on_attach_file_button_clicked(self):
> """
>
> === modified file 'openlp/core/ui/mainwindow.py'
> --- openlp/core/ui/mainwindow.py 2016-07-01 21:17:20 +0000
> +++ openlp/core/ui/mainwindow.py 2016-08-02 20:20:09 +0000
> @@ -426,41 +426,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 '
Removed
> + 'this or an another machine.'))
Fixed
> 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'))
Fixed
> + 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.'))
Fixed
> + 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.'))
Fixed
> + 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'
Fixed
> + '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'))
> @@ -487,11 +488,13 @@
> 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_default_item.setStatusTip(translate('OpenLP.MainWindow', 'Reset the interface back to the '
'default layout and show all the panels.'))
> 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):
> @@ -859,9 +862,9 @@
> 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)'))
Removed Exported (See irc) "superfly: The issue with keeping "OpenLP" in exported/imported is that the text gets too long and does not fit the file browser filetype description, thus I would prefer removing it. https://drive.google.com/file/d/0B9y8rZiYItltRk1lR1V1bGU3ZUk/view?usp=sharing";
> if not import_file_name:
> return
> setting_sections = []
> @@ -951,7 +954,7 @@
> self,
> translate('OpenLP.MainWindow', 'Export Settings File'),
Fixed?
> '',
> - translate('OpenLP.MainWindow', 'OpenLP Export Settings File (*.conf)'))
> + translate('OpenLP.MainWindow', 'Exported OpenLP Settings (*.conf)'))
"The issue with keeping "OpenLP" in exported/imported is that the text gets too long and does not fit the file browser filetype description, thus I would prefer removing it. https://drive.google.com/file/d/0B9y8rZiYItltRk1lR1V1bGU3ZUk/view?usp=sharing";
> if not export_file_name:
> return
> # Make sure it's a .conf file.
>
> === modified file 'openlp/plugins/images/lib/mediaitem.py'
> --- openlp/plugins/images/lib/mediaitem.py 2016-05-21 18:19:18 +0000
> +++ openlp/plugins/images/lib/mediaitem.py 2016-08-02 20:20:09 +0000
> @@ -180,7 +180,7 @@
> 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)'),
This is for the right click menu item on clicking images in Library. No other Right click menu items use periods, why should this?
> icon=':/general/general_open.png', triggers=self.on_file_click)
>
> def add_start_header_bar(self):
>
> === modified file 'openlp/plugins/media/lib/mediaitem.py'
> --- openlp/plugins/media/lib/mediaitem.py 2016-05-21 18:19:18 +0000
> +++ openlp/plugins/media/lib/mediaitem.py 2016-08-02 20:20:09 +0000
> @@ -133,7 +133,7 @@
> 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.')
Fixed
> self.load_optical = self.toolbar.add_toolbar_action('load_optical', icon=self.optical_icon,
> text=optical_button_text,
> tooltip=optical_button_tooltip,
>
> === modified file 'openlp/plugins/presentations/lib/presentationtab.py'
> --- openlp/plugins/presentations/lib/presentationtab.py 2016-05-21 18:19:18 +0000
> +++ openlp/plugins/presentations/lib/presentationtab.py 2016-08-02 20:20:09 +0000
> @@ -125,11 +125,11 @@
> 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 current slide advances to the next effect'))
Fixed
> 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 8 and 10)'))
Fixed
> self.pdf_program_check_box.setText(
> translate('PresentationPlugin.PresentationTab', 'Use given full path for mudraw or ghostscript binary:'))
>
--
https://code.launchpad.net/~suutari-olli/openlp/ui-messages-part-1/+merge/301833
Your team OpenLP Core is subscribed to branch lp:openlp.
References
