diff --git a/openlp/core/__init__.py b/openlp/core/__init__.py index 852bf5424..92cb9cab4 100644 --- a/openlp/core/__init__.py +++ b/openlp/core/__init__.py @@ -208,8 +208,8 @@ class OpenLP(OpenLPMixin, QtWidgets.QApplication): # If data_version is different from the current version ask if we should backup the data folder elif data_version != openlp_version: if QtWidgets.QMessageBox.question(None, translate('OpenLP', 'Backup'), - translate('OpenLP', 'OpenLP has been upgraded, do you want to\ncreate ' - 'a backup of the old data folder?'), + translate('OpenLP', 'OpenLP has been upgraded, do you want to create ' + 'a backup of OpenLPs data folder?'), QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No, QtWidgets.QMessageBox.Yes) == QtWidgets.QMessageBox.Yes: # Create copy of data folder @@ -223,7 +223,7 @@ class OpenLP(OpenLPMixin, QtWidgets.QApplication): translate('OpenLP', 'Backup of the data folder failed!')) return message = translate('OpenLP', - 'A backup of the data folder has been created in:\n\n' + 'A backup of the data folder has been created at:/n' '{text}').format(text=data_folder_backup_path) QtWidgets.QMessageBox.information(None, translate('OpenLP', 'Backup'), message) diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py index bec198288..be92d2d49 100644 --- a/openlp/core/lib/__init__.py +++ b/openlp/core/lib/__init__.py @@ -323,11 +323,12 @@ def create_separated_list(string_list): return_list = translate('OpenLP.core.lib', '{one} and {two}').format(one=string_list[0], two=string_list[1]) elif list_length > 2: return_list = translate('OpenLP.core.lib', '{first}, and {last}').format(first=', '.join(string_list[:-1]), - last=string_list[-1]) + last=string_list[-1]) else: return_list = "" return return_list + from .exceptions import ValidationError from .filedialog import FileDialog from .screen import ScreenList