openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #29712
[Merge] lp:~suutari-olli/openlp/ui-messages-part-1 into lp:openlp
Azaziah has proposed merging lp:~suutari-olli/openlp/ui-messages-part-1 into lp:openlp.
Requested reviews:
Tim Bentley (trb143)
For more details, see:
https://code.launchpad.net/~suutari-olli/openlp/ui-messages-part-1/+merge/295117
This branch includes various UI string changes, such as:
- Media Manager, Projector Manager, Service Manager, Theme Manager,
Preview Panel and Live Panel have been renamed to: ”Library,
Projectors, Service, Themes, Preview and Live."
- Tooltips/texts for these have been changed.
- Removed version from window title
- Removed version from web remote page window names.
- Re-did the trace back message.
- etc...
In "Configurate OpenLP":
- Changed typing for all labels to lowercase
- Removed "Manager" from some strings since it's no longer used.
- Added dots to various tooltips / descriptions.
- In advanced tab: Number of recent files to display:
has been changed to Number of recent Service files to display:
lp:~suutari-olli/openlp/ui-messages-part-1 (revision 2651)
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-01-Pull/1563/
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-02-Functional-Tests/1474/
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-03-Interface-Tests/1412/
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1192/
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/782/
[←[1;31mFAILURE←[1;m] https://ci.openlp.io/job/Branch-05a-Code_Analysis/850/
Stopping after failure
This passed before merging trunk and fails due to unrelated files.
--
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/common/uistrings.py'
--- openlp/core/common/uistrings.py 2016-05-14 04:24:46 +0000
+++ openlp/core/common/uistrings.py 2016-05-18 18:17:09 +0000
@@ -52,6 +52,7 @@
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')
=== modified file 'openlp/core/ui/advancedtab.py'
--- openlp/core/ui/advancedtab.py 2016-04-16 21:01:22 +0000
+++ openlp/core/ui/advancedtab.py 2016-05-18 18:17:09 +0000
@@ -252,17 +252,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'))
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'))
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'))
=== 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-05-18 18:17:09 +0000
@@ -43,6 +43,8 @@
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'))
@@ -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>'
+ '<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-04-04 19:53:54 +0000
+++ openlp/core/ui/exceptionform.py 2016-05-18 18:17:09 +0000
@@ -199,7 +199,8 @@
else:
self.__button_state(False)
self.description_word_count.setText(
- translate('OpenLP.ExceptionDialog', 'Description characters to enter : %s') % count)
+ translate('OpenLP.ExceptionDialog', '{count} characters from the minimum description remaining.'
+ ).format(count=count))
def on_attach_file_button_clicked(self):
"""
=== modified file 'openlp/core/ui/generaltab.py'
--- openlp/core/ui/generaltab.py 2016-04-17 18:57:03 +0000
+++ openlp/core/ui/generaltab.py 2016-05-18 18:17:09 +0000
@@ -246,7 +246,7 @@
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)
@@ -258,9 +258,9 @@
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 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'))
=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py 2016-04-29 20:25:12 +0000
+++ openlp/core/ui/mainwindow.py 2016-05-18 18:17:09 +0000
@@ -387,21 +387,21 @@
"""
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'))
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)
@@ -418,7 +418,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.'))
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'))
@@ -427,41 +427,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'))
+ 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'))
@@ -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_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)'))
if not import_file_name:
return
setting_sections = []
@@ -951,7 +954,7 @@
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.
@@ -1168,9 +1171,9 @@
:param file_name: The file name of the service file.
"""
if modified:
- title = '{title} - {name}*'.format(title=UiStrings().OLPV2x, name=file_name)
+ title = '{title} - {name}*'.format(title=UiStrings().OLP, name=file_name)
else:
- title = '{title} - {name}'.format(title=UiStrings().OLPV2x, name=file_name)
+ title = '{title} - {name}'.format(title=UiStrings().OLP, name=file_name)
self.setWindowTitle(title)
def show_status_message(self, message):
=== modified file 'openlp/core/ui/media/playertab.py'
--- openlp/core/ui/media/playertab.py 2016-04-17 18:57:03 +0000
+++ openlp/core/ui/media/playertab.py 2016-05-18 18:17:09 +0000
@@ -126,7 +126,7 @@
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().BackgroundColorColon)
self.information_label.setText(translate('OpenLP.PlayerTab',
'Visible background for videos with aspect ratio different to screen.'))
self.retranslate_players()
=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py 2016-05-05 03:57:04 +0000
+++ openlp/core/ui/slidecontroller.py 2016-05-18 18:17:09 +0000
@@ -290,7 +290,7 @@
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)
=== modified file 'openlp/core/ui/themewizard.py'
--- openlp/core/ui/themewizard.py 2016-04-30 17:19:55 +0000
+++ openlp/core/ui/themewizard.py 2016-05-18 18:17:09 +0000
@@ -444,15 +444,15 @@
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'))
@@ -461,7 +461,7 @@
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'))
=== modified file 'openlp/plugins/alerts/lib/alertstab.py'
--- openlp/plugins/alerts/lib/alertstab.py 2016-04-17 19:06:17 +0000
+++ openlp/plugins/alerts/lib/alertstab.py 2016-05-18 18:17:09 +0000
@@ -99,11 +99,11 @@
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.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)
=== modified file 'openlp/plugins/bibles/lib/biblestab.py'
--- openlp/plugins/bibles/lib/biblestab.py 2015-12-31 22:46:06 +0000
+++ openlp/plugins/bibles/lib/biblestab.py 2016-05-18 18:17:09 +0000
@@ -171,13 +171,13 @@
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:'))
- 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.')
=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py 2016-04-10 20:24:07 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py 2016-05-18 18:17:09 +0000
@@ -186,7 +186,7 @@
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 @@
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)
=== modified file 'openlp/plugins/images/imageplugin.py'
--- openlp/plugins/images/imageplugin.py 2016-01-08 13:47:52 +0000
+++ openlp/plugins/images/imageplugin.py 2016-05-18 18:17:09 +0000
@@ -88,7 +88,7 @@
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.'),
=== modified file 'openlp/plugins/images/lib/imagetab.py'
--- openlp/plugins/images/lib/imagetab.py 2016-04-17 19:06:17 +0000
+++ openlp/plugins/images/lib/imagetab.py 2016-05-18 18:17:09 +0000
@@ -62,7 +62,7 @@
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.'))
=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py 2016-04-17 19:32:15 +0000
+++ openlp/plugins/images/lib/mediaitem.py 2016-05-18 18:17:09 +0000
@@ -75,8 +75,8 @@
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)
@@ -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)'),
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-04-13 18:38:49 +0000
+++ openlp/plugins/media/lib/mediaitem.py 2016-05-18 18:17: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.')
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/media/lib/mediatab.py'
--- openlp/plugins/media/lib/mediatab.py 2015-12-31 22:46:06 +0000
+++ openlp/plugins/media/lib/mediatab.py 2016-05-18 18:17:09 +0000
@@ -54,7 +54,7 @@
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'))
=== modified file 'openlp/plugins/presentations/lib/powerpointcontroller.py'
--- openlp/plugins/presentations/lib/powerpointcontroller.py 2015-12-31 22:46:06 +0000
+++ openlp/plugins/presentations/lib/powerpointcontroller.py 2016-05-18 18:17:09 +0000
@@ -514,7 +514,7 @@
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.'))
=== modified file 'openlp/plugins/presentations/lib/presentationtab.py'
--- openlp/plugins/presentations/lib/presentationtab.py 2016-04-30 09:05:10 +0000
+++ openlp/plugins/presentations/lib/presentationtab.py 2016-05-18 18:17: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 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:'))
@@ -151,7 +151,7 @@
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)
=== 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-05-18 18:17:09 +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),
- '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'),
=== modified file 'openlp/plugins/songs/lib/songstab.py'
--- openlp/plugins/songs/lib/songstab.py 2015-12-31 22:46:06 +0000
+++ openlp/plugins/songs/lib/songstab.py 2016-05-18 18:17:09 +0000
@@ -68,10 +68,10 @@
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') %
=== modified file 'tests/functional/openlp_core_ui/test_mainwindow.py'
--- tests/functional/openlp_core_ui/test_mainwindow.py 2016-04-21 21:16:24 +0000
+++ tests/functional/openlp_core_ui/test_mainwindow.py 2016-05-18 18:17:09 +0000
@@ -110,9 +110,9 @@
# 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):
"""
@@ -124,8 +124,8 @@
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 "<the contents of UiStrings().OLPV2x> - test.osz*"')
+ self.assertEqual(self.main_window.windowTitle(), '%s - %s*' % (UiStrings().OLP, 'test.osz'),
+ 'The main window\'s title should be set to "<the contents of UiStrings().OLP> - test.osz*"')
def set_service_unmodified_test(self):
"""
@@ -137,8 +137,8 @@
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 "<the contents of UiStrings().OLPV2x> - test.osz"')
+ self.assertEqual(self.main_window.windowTitle(), '%s - %s' % (UiStrings().OLP, 'test.osz'),
+ 'The main window\'s title should be set to "<the contents of UiStrings().OLP> - test.osz"')
def mainwindow_configuration_test(self):
"""
Follow ups
