openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #10023
[Merge] lp:~j-corwin/openlp/general into lp:openlp
Jonathan Corwin has proposed merging lp:~j-corwin/openlp/general into lp:openlp.
Requested reviews:
Tim Bentley (trb143)
Raoul Snyman (raoul-snyman)
Related bugs:
Bug #634771 in OpenLP: "OpenLP 1.9.2+bzr1016-0ubuntu1~lucid1 does not start"
https://bugs.launchpad.net/openlp/+bug/634771
Bug #646718 in OpenLP: "Songbook, Number will not loaded, Title will not be saved"
https://bugs.launchpad.net/openlp/+bug/646718
Bug #696013 in OpenLP: "song import from powerpoint crashes every second time"
https://bugs.launchpad.net/openlp/+bug/696013
Bug #696021 in OpenLP: "presentation loader does not work fine in Windows using Powerpoint Viewer 2007"
https://bugs.launchpad.net/openlp/+bug/696021
Bug #696637 in OpenLP: "Alert not positioned correctly in single screen"
https://bugs.launchpad.net/openlp/+bug/696637
Bug #727732 in OpenLP: "Openlp 1.9.?? crashes on start"
https://bugs.launchpad.net/openlp/+bug/727732
Bug #735039 in OpenLP: "Cannot import PowerPoint Presentations with PowerPoint 2010"
https://bugs.launchpad.net/openlp/+bug/735039
For more details, see:
https://code.launchpad.net/~j-corwin/openlp/general/+merge/64283
More string changes found whilst translating.
(Apologies for the lines that haven't noticeably changed, appears Eric has found/fixed a few more trailing spaces)
** The UI for the stop time says "Finish" so changed the end times messages accordingly
--
https://code.launchpad.net/~j-corwin/openlp/general/+merge/64283
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py 2011-06-11 07:05:39 +0000
+++ openlp/core/lib/mediamanageritem.py 2011-06-11 08:06:38 +0000
@@ -341,8 +341,8 @@
critical_error_message_box(
UiStrings().Duplicate,
unicode(translate('OpenLP.MediaManagerItem',
- 'Duplicate file name %s.\nFilename already exists in '
- 'list')) % filename)
+ 'Duplicate filename %s.\nThis filename is already in '
+ 'the list')) % filename)
else:
newFiles.append(file)
self.loadList(newFiles)
=== modified file 'openlp/core/ui/displaytagform.py'
--- openlp/core/ui/displaytagform.py 2011-05-30 15:07:49 +0000
+++ openlp/core/ui/displaytagform.py 2011-06-11 08:06:38 +0000
@@ -128,7 +128,7 @@
tag = {
u'desc': translate('OpenLP.DisplayTagTab', 'New Tag'),
u'start tag': u'{n}',
- u'start html': translate('OpenLP.DisplayTagTab', '<Html_here>'),
+ u'start html': translate('OpenLP.DisplayTagTab', '<HTML here>'),
u'end tag': u'{/n}',
u'end html': translate('OpenLP.DisplayTagTab', '</and here>'),
u'protected': False
=== modified file 'openlp/core/ui/servicemanager.py'
--- openlp/core/ui/servicemanager.py 2011-06-08 21:39:07 +0000
+++ openlp/core/ui/servicemanager.py 2011-06-11 08:06:38 +0000
@@ -629,7 +629,7 @@
QtGui.QMessageBox.information(self,
translate('OpenLP.ServiceManager', 'Corrupt File'),
translate('OpenLP.ServiceManager', 'This file is either '
- 'corrupt or not an OpenLP 2.0 service file.'))
+ 'corrupt or it is not an OpenLP 2.0 service file.'))
return
finally:
if fileTo:
=== modified file 'openlp/core/ui/starttimeform.py'
--- openlp/core/ui/starttimeform.py 2011-05-26 17:11:22 +0000
+++ openlp/core/ui/starttimeform.py 2011-06-11 08:06:38 +0000
@@ -74,14 +74,14 @@
title=translate('OpenLP.StartTimeForm',
'Time Validation Error'),
message=translate('OpenLP.StartTimeForm',
- 'End time is set after the end of the media item'))
+ 'Finish time is set after the end of the media item'))
return
elif start > end:
critical_error_message_box(
title=translate('OpenLP.StartTimeForm',
'Time Validation Error'),
message=translate('OpenLP.StartTimeForm',
- 'Start time is after the End Time of the media item'))
+ 'Start time is after the finish time of the media item'))
return
self.item[u'service_item'].start_time = start
self.item[u'service_item'].end_time = end
=== modified file 'openlp/plugins/bibles/bibleplugin.py'
--- openlp/plugins/bibles/bibleplugin.py 2011-05-26 20:41:19 +0000
+++ openlp/plugins/bibles/bibleplugin.py 2011-06-11 08:06:38 +0000
@@ -81,11 +81,11 @@
Perform tasks on application starup
"""
if len(self.manager.old_bible_databases):
- if QtGui.QMessageBox.information(self.formparent,
+ if QtGui.QMessageBox.information(self.formparent,
translate('OpenLP', 'Information'), translate('OpenLP',
'Bible format has changed.\nYou have to upgrade your '
- 'existing Bibles.\nShould OpenLP upgrade now?'),
- QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes |
+ 'existing Bibles.\nShould OpenLP upgrade now?'),
+ QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes |
QtGui.QMessageBox.No)) == QtGui.QMessageBox.Yes:
self.onToolsUpgradeItemTriggered()
@@ -120,7 +120,7 @@
translate('BiblePlugin', '&Upgrade older Bibles'))
self.toolsUpgradeItem.setStatusTip(
translate('BiblePlugin', 'Upgrade the Bible databases to the '
- 'latest format'))
+ 'latest format.'))
tools_menu.addAction(self.toolsUpgradeItem)
QtCore.QObject.connect(self.toolsUpgradeItem,
QtCore.SIGNAL(u'triggered()'), self.onToolsUpgradeItemTriggered)
@@ -131,7 +131,7 @@
Upgrade older bible databases.
"""
if not hasattr(self, u'upgrade_wizard'):
- self.upgrade_wizard = BibleUpgradeForm(self.formparent,
+ self.upgrade_wizard = BibleUpgradeForm(self.formparent,
self.manager, self)
# If the import was not cancelled then reload.
if self.upgrade_wizard.exec_():
=== modified file 'openlp/plugins/bibles/forms/bibleupgradeform.py'
--- openlp/plugins/bibles/forms/bibleupgradeform.py 2011-06-09 21:17:04 +0000
+++ openlp/plugins/bibles/forms/bibleupgradeform.py 2011-06-11 08:06:38 +0000
@@ -139,7 +139,7 @@
self.plugin.settingsSection, 1)))
if filename:
self.backupDirectoryEdit.setText(filename)
- SettingsManager.set_last_dir(self.plugin.settingsSection,
+ SettingsManager.set_last_dir(self.plugin.settingsSection,
filename, 1)
def onNoBackupCheckBoxToggled(self, checked):
@@ -211,7 +211,7 @@
self.backupBrowseButton.setIcon(self.openIcon)
self.backupBrowseButton.setObjectName(u'BackupBrowseButton')
self.backupDirectoryLayout.addWidget(self.backupBrowseButton)
- self.formLayout.addRow(self.backupDirectoryLabel,
+ self.formLayout.addRow(self.backupDirectoryLabel,
self.backupDirectoryLayout)
self.backupLayout.addLayout(self.formLayout)
self.noBackupCheckBox = QtGui.QCheckBox(self.backupPage)
@@ -282,7 +282,7 @@
self.verticalWidget[number])
versionInfoLabelName = u'versionInfoLabel[%d]' % number
self.versionInfoLabel[number].setObjectName(versionInfoLabelName)
- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding,
+ sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding,
QtGui.QSizePolicy.Preferred)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
@@ -304,12 +304,12 @@
self.versionNameLabel[number] = QtGui.QLabel(
self.formWidget[number])
self.versionNameLabel[number].setObjectName(u'VersionNameLabel')
- self.formLayoutAttention[number].setWidget(0,
+ self.formLayoutAttention[number].setWidget(0,
QtGui.QFormLayout.LabelRole, self.versionNameLabel[number])
self.versionNameEdit[number] = QtGui.QLineEdit(
self.formWidget[number])
self.versionNameEdit[number].setObjectName(u'VersionNameEdit')
- self.formLayoutAttention[number].setWidget(0,
+ self.formLayoutAttention[number].setWidget(0,
QtGui.QFormLayout.FieldRole, self.versionNameEdit[number])
self.versionNameEdit[number].setText(bible.get_name())
self.formLayout.addWidget(self.formWidget[number])
@@ -346,13 +346,13 @@
self.versionNameEdit[number].setParent(None)
self.formLayout.removeWidget(self.formWidget[number])
self.formWidget[number].setParent(None)
- self.formLayout.removeItem(self.spacerItem)
+ self.formLayout.removeItem(self.spacerItem)
def retranslateUi(self):
"""
Allow for localisation of the bible import wizard.
"""
- self.setWindowTitle(translate('BiblesPlugin.UpgradeWizardForm',
+ self.setWindowTitle(translate('BiblesPlugin.UpgradeWizardForm',
'Bible Upgrade Wizard'))
self.titleLabel.setText(WizardStrings.HeaderStyle %
translate('OpenLP.Ui', 'Welcome to the Bible Upgrade Wizard'))
@@ -379,7 +379,7 @@
self.backupDirectoryLabel.setText(
translate('BiblesPlugin.UpgradeWizardForm', 'Backup Directory:'))
self.noBackupCheckBox.setText(
- translate('BiblesPlugin.UpgradeWizardForm',
+ translate('BiblesPlugin.UpgradeWizardForm',
'There is no need to backup my Bibles'))
self.selectPage.setTitle(
translate('BiblesPlugin.UpgradeWizardForm',
@@ -440,7 +440,7 @@
return False
elif self.manager.exists(version_name):
critical_error_message_box(
- translate('BiblesPlugin.UpgradeWizardForm',
+ translate('BiblesPlugin.UpgradeWizardForm',
'Bible Exists'),
translate('BiblesPlugin.UpgradeWizardForm',
'This Bible already exists. Please upgrade '
@@ -451,15 +451,15 @@
elif os.path.exists(os.path.join(self.path, clean_filename(
version_name))) and version_name == filename[1]:
newfilename = u'old_database_%s' % filename[0]
- if not os.path.exists(os.path.join(self.path,
+ if not os.path.exists(os.path.join(self.path,
newfilename)):
- os.rename(os.path.join(self.path, filename[0]),
+ os.rename(os.path.join(self.path, filename[0]),
os.path.join(self.path, newfilename))
self.files[number] = [newfilename, filename[1]]
continue
else:
critical_error_message_box(
- translate('BiblesPlugin.UpgradeWizardForm',
+ translate('BiblesPlugin.UpgradeWizardForm',
'Bible Exists'),
translate('BiblesPlugin.UpgradeWizardForm',
'This Bible already exists. Please upgrade '
@@ -469,10 +469,10 @@
self.formWidget[number].show()
self.versionNameEdit[number].setFocus()
return False
- elif os.path.exists(os.path.join(self.path,
+ elif os.path.exists(os.path.join(self.path,
clean_filename(version_name))):
critical_error_message_box(
- translate('BiblesPlugin.UpgradeWizardForm',
+ translate('BiblesPlugin.UpgradeWizardForm',
'Bible Exists'),
translate('BiblesPlugin.UpgradeWizardForm',
'This Bible already exists. Please upgrade '
@@ -521,7 +521,7 @@
OpenLPWizard.preWizard(self)
self.progressLabel.setText(translate(
'BiblesPlugin.UpgradeWizardForm',
- 'Starting upgrading Bible(s)...'))
+ 'Starting Bible upgrade...'))
Receiver.send_message(u'openlp_process_events')
def performWizard(self):
@@ -550,21 +550,21 @@
if not self.checkBox[biblenumber].checkState() == QtCore.Qt.Checked:
continue
self.progressBar.reset()
- oldbible = OldBibleDB(self.mediaItem, path=self.path,
+ oldbible = OldBibleDB(self.mediaItem, path=self.path,
file=filename[0])
name = filename[1]
if name is None:
delete_file(os.path.join(self.path, filename[0]))
self.incrementProgressBar(unicode(translate(
- 'BiblesPlugin.UpgradeWizardForm',
- 'Upgrading Bible %s of %s: "%s"\nFailed')) %
- (number + 1, self.maxBibles, name),
+ 'BiblesPlugin.UpgradeWizardForm',
+ 'Upgrading Bible %s of %s: "%s"\nFailed')) %
+ (number + 1, self.maxBibles, name),
self.progressBar.maximum() - self.progressBar.value())
number += 1
continue
self.progressLabel.setText(unicode(translate(
- 'BiblesPlugin.UpgradeWizardForm',
- 'Upgrading Bible %s of %s: "%s"\nUpgrading ...')) %
+ 'BiblesPlugin.UpgradeWizardForm',
+ 'Upgrading Bible %s of %s: "%s"\nUpgrading ...')) %
(number + 1, self.maxBibles, name))
if os.path.exists(os.path.join(self.path, filename[0])):
name = unicode(self.versionNameEdit[biblenumber].text())
@@ -596,26 +596,26 @@
if not books:
log.error(u'Upgrading books from %s - download '\
u'name: "%s" failed' % (
- meta_data[u'download source'],
+ meta_data[u'download source'],
meta_data[u'download name']))
- delete_database(self.path, clean_filename(name))
+ delete_database(self.path, clean_filename(name))
del self.newbibles[number]
critical_error_message_box(
- translate('BiblesPlugin.UpgradeWizardForm',
+ translate('BiblesPlugin.UpgradeWizardForm',
'Download Error'),
- translate('BiblesPlugin.UpgradeWizardForm',
+ translate('BiblesPlugin.UpgradeWizardForm',
'To upgrade your Web Bibles an Internet connection is '
'required. If you have a working Internet connection '
'and this error still occurs, please report a bug.'))
self.incrementProgressBar(unicode(translate(
- 'BiblesPlugin.UpgradeWizardForm',
- 'Upgrading Bible %s of %s: "%s"\nFailed')) %
- (number + 1, self.maxBibles, name),
+ 'BiblesPlugin.UpgradeWizardForm',
+ 'Upgrading Bible %s of %s: "%s"\nFailed')) %
+ (number + 1, self.maxBibles, name),
self.progressBar.maximum() - self.progressBar.value())
number += 1
continue
bible = BiblesResourcesDB.get_webbible(
- meta_data[u'download name'],
+ meta_data[u'download name'],
meta_data[u'download source'].lower())
if bible and bible[u'language_id']:
language_id = bible[u'language_id']
@@ -628,8 +628,8 @@
delete_database(self.path, clean_filename(name))
del self.newbibles[number]
self.incrementProgressBar(unicode(translate(
- 'BiblesPlugin.UpgradeWizardForm',
- 'Upgrading Bible %s of %s: "%s"\nFailed')) %
+ 'BiblesPlugin.UpgradeWizardForm',
+ 'Upgrading Bible %s of %s: "%s"\nFailed')) %
(number + 1, self.maxBibles, name),
self.progressBar.maximum() - self.progressBar.value())
number += 1
@@ -640,23 +640,23 @@
bible_failed = True
break
self.incrementProgressBar(unicode(translate(
- 'BiblesPlugin.UpgradeWizardForm',
+ 'BiblesPlugin.UpgradeWizardForm',
'Upgrading Bible %s of %s: "%s"\n'
- 'Upgrading %s ...')) %
+ 'Upgrading %s ...')) %
(number + 1, self.maxBibles, name, book))
book_ref_id = self.newbibles[number].\
get_book_ref_id_by_name(book, len(books), language_id)
if not book_ref_id:
log.warn(u'Upgrading books from %s - download '\
u'name: "%s" aborted by user' % (
- meta_data[u'download source'],
+ meta_data[u'download source'],
meta_data[u'download name']))
delete_database(self.path, clean_filename(name))
del self.newbibles[number]
bible_failed = True
break
book_details = BiblesResourcesDB.get_book_by_id(book_ref_id)
- db_book = self.newbibles[number].create_book(book,
+ db_book = self.newbibles[number].create_book(book,
book_ref_id, book_details[u'testament_id'])
# Try to import still downloaded verses
oldbook = oldbible.get_book(book)
@@ -670,8 +670,8 @@
if self.stop_import_flag:
bible_failed = True
break
- self.newbibles[number].create_verse(db_book.id,
- int(verse[u'chapter']),
+ self.newbibles[number].create_verse(db_book.id,
+ int(verse[u'chapter']),
int(verse[u'verse']), unicode(verse[u'text']))
Receiver.send_message(u'openlp_process_events')
self.newbibles[number].session.commit()
@@ -685,9 +685,9 @@
delete_database(self.path, clean_filename(name))
del self.newbibles[number]
self.incrementProgressBar(unicode(translate(
- 'BiblesPlugin.UpgradeWizardForm',
- 'Upgrading Bible %s of %s: "%s"\nFailed')) %
- (number + 1, self.maxBibles, name),
+ 'BiblesPlugin.UpgradeWizardForm',
+ 'Upgrading Bible %s of %s: "%s"\nFailed')) %
+ (number + 1, self.maxBibles, name),
self.progressBar.maximum() - self.progressBar.value())
number += 1
continue
@@ -698,12 +698,12 @@
bible_failed = True
break
self.incrementProgressBar(unicode(translate(
- 'BiblesPlugin.UpgradeWizardForm',
+ 'BiblesPlugin.UpgradeWizardForm',
'Upgrading Bible %s of %s: "%s"\n'
- 'Upgrading %s ...')) %
+ 'Upgrading %s ...')) %
(number + 1, self.maxBibles, name, book[u'name']))
book_ref_id = self.newbibles[number].\
- get_book_ref_id_by_name(book[u'name'], len(books),
+ get_book_ref_id_by_name(book[u'name'], len(books),
language_id)
if not book_ref_id:
log.warn(u'Upgrading books from %s " '\
@@ -725,8 +725,8 @@
if self.stop_import_flag:
bible_failed = True
break
- self.newbibles[number].create_verse(db_book.id,
- int(verse[u'chapter']),
+ self.newbibles[number].create_verse(db_book.id,
+ int(verse[u'chapter']),
int(verse[u'verse']), unicode(verse[u'text']))
Receiver.send_message(u'openlp_process_events')
self.newbibles[number].session.commit()
@@ -735,16 +735,16 @@
oldbible.close_connection()
delete_file(os.path.join(self.path, filename[0]))
self.incrementProgressBar(unicode(translate(
- 'BiblesPlugin.UpgradeWizardForm',
+ 'BiblesPlugin.UpgradeWizardForm',
'Upgrading Bible %s of %s: "%s"\n'
- 'Done')) %
+ 'Done')) %
(number + 1, self.maxBibles, name))
self.success[biblenumber] = True
else:
self.incrementProgressBar(unicode(translate(
- 'BiblesPlugin.UpgradeWizardForm',
- 'Upgrading Bible %s of %s: "%s"\nFailed')) %
- (number + 1, self.maxBibles, name),
+ 'BiblesPlugin.UpgradeWizardForm',
+ 'Upgrading Bible %s of %s: "%s"\nFailed')) %
+ (number + 1, self.maxBibles, name),
self.progressBar.maximum() - self.progressBar.value())
delete_database(self.path, clean_filename(name))
number += 1
@@ -762,7 +762,7 @@
failed_import += 1
if failed_import > 0:
failed_import_text = unicode(translate(
- 'BiblesPlugin.UpgradeWizardForm',
+ 'BiblesPlugin.UpgradeWizardForm',
', %s failed')) % failed_import
else:
failed_import_text = u''
@@ -772,12 +772,12 @@
translate('BiblesPlugin.UpgradeWizardForm', 'Upgrading '
'Bible(s): %s successful%s\nPlease note, that verses from '
'Web Bibles will be downloaded\non demand and so an '
- 'Internet connection is required.')) %
+ 'Internet connection is required.')) %
(successful_import, failed_import_text))
else:
self.progressLabel.setText(unicode(
translate('BiblesPlugin.UpgradeWizardForm', 'Upgrading '
- 'Bible(s): %s successful%s')) % (successful_import,
+ 'Bible(s): %s successful%s')) % (successful_import,
failed_import_text))
else:
self.progressLabel.setText(
=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py 2011-06-11 07:05:39 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py 2011-06-11 08:06:38 +0000
@@ -695,7 +695,7 @@
QtGui.QMessageBox.information(self,
translate('BiblePlugin.MediaItem', 'Information'),
unicode(translate('BiblePlugin.MediaItem',
- 'The second Bibles does not contain all the verses '
+ 'The second Bible does not contain all the verses '
'that are in the main Bible. Only verses found in both '
'Bibles will be shown. %d verses have not been '
'included in the results.')) % count,
Follow ups
