forked from openlp/openlp
fix some mission spaces and addapt some strings
This commit is contained in:
Armin Köhler
parent
905fc6d91f
commit
06cce54788
|
|
@ -89,90 +89,90 @@ class BibleStrings(object):
|
|||
These strings should need a good reason to be retranslated elsewhere.
|
||||
"""
|
||||
self.Booknames = {
|
||||
u'Gen': translate('BiblesPlugin','Genesis'),
|
||||
u'Exod': translate('BiblesPlugin','Exodus'),
|
||||
u'Lev': translate('BiblesPlugin','Leviticus'),
|
||||
u'Num': translate('BiblesPlugin','Numbers'),
|
||||
u'Deut': translate('BiblesPlugin','Deuteronomy'),
|
||||
u'Josh': translate('BiblesPlugin','Joshua'),
|
||||
u'Judg': translate('BiblesPlugin','Judges'),
|
||||
u'Ruth': translate('BiblesPlugin','Ruth'),
|
||||
u'1Sam': translate('BiblesPlugin','1 Samuel'),
|
||||
u'2Sam': translate('BiblesPlugin','2 Samuel'),
|
||||
u'1Kgs': translate('BiblesPlugin','1 Kings'),
|
||||
u'2Kgs': translate('BiblesPlugin','2 Kings'),
|
||||
u'1Chr': translate('BiblesPlugin','1 Chronicles'),
|
||||
u'2Chr': translate('BiblesPlugin','2 Chronicles'),
|
||||
u'Esra': translate('BiblesPlugin','Ezra'),
|
||||
u'Neh': translate('BiblesPlugin','Nehemiah'),
|
||||
u'Esth': translate('BiblesPlugin','Esther'),
|
||||
u'Job': translate('BiblesPlugin','Job'),
|
||||
u'Ps': translate('BiblesPlugin','Psalms'),
|
||||
u'Prov': translate('BiblesPlugin','Proverbs'),
|
||||
u'Eccl': translate('BiblesPlugin','Ecclesiastes'),
|
||||
u'Song': translate('BiblesPlugin','Song of Solomon'),
|
||||
u'Isa': translate('BiblesPlugin','Isaiah'),
|
||||
u'Jer': translate('BiblesPlugin','Jeremiah'),
|
||||
u'Lam': translate('BiblesPlugin','Lamentations'),
|
||||
u'Ezek': translate('BiblesPlugin','Ezekiel'),
|
||||
u'Dan': translate('BiblesPlugin','Daniel'),
|
||||
u'Hos': translate('BiblesPlugin','Hosea'),
|
||||
u'Joel': translate('BiblesPlugin','Joel'),
|
||||
u'Amos': translate('BiblesPlugin','Amos'),
|
||||
u'Obad': translate('BiblesPlugin','Obadiah'),
|
||||
u'Jonah': translate('BiblesPlugin','Jonah'),
|
||||
u'Mic': translate('BiblesPlugin','Micah'),
|
||||
u'Nah': translate('BiblesPlugin','Nahum'),
|
||||
u'Hab': translate('BiblesPlugin','Habakkuk'),
|
||||
u'Zeph': translate('BiblesPlugin','Zephaniah'),
|
||||
u'Hag': translate('BiblesPlugin','Haggai'),
|
||||
u'Zech': translate('BiblesPlugin','Zechariah'),
|
||||
u'Mal': translate('BiblesPlugin','Malachi'),
|
||||
u'Matt': translate('BiblesPlugin','Matthew'),
|
||||
u'Mark': translate('BiblesPlugin','Mark'),
|
||||
u'Luke': translate('BiblesPlugin','Luke'),
|
||||
u'John': translate('BiblesPlugin','John'),
|
||||
u'Acts': translate('BiblesPlugin','Acts'),
|
||||
u'Rom': translate('BiblesPlugin','Romans'),
|
||||
u'1Cor': translate('BiblesPlugin','1 Corinthians'),
|
||||
u'2Cor': translate('BiblesPlugin','2 Corinthians'),
|
||||
u'Gal': translate('BiblesPlugin','Galatians'),
|
||||
u'Eph': translate('BiblesPlugin','Ephesians'),
|
||||
u'Phil': translate('BiblesPlugin','Philippians'),
|
||||
u'Col': translate('BiblesPlugin','Colossians'),
|
||||
u'1Thess': translate('BiblesPlugin','1 Thessalonians'),
|
||||
u'2Thess': translate('BiblesPlugin','2 Thessalonians'),
|
||||
u'1Tim': translate('BiblesPlugin','1 Timothy'),
|
||||
u'2Tim': translate('BiblesPlugin','2 Timothy'),
|
||||
u'Titus': translate('BiblesPlugin','Titus'),
|
||||
u'Phlm': translate('BiblesPlugin','Philemon'),
|
||||
u'Heb': translate('BiblesPlugin','Hebrews'),
|
||||
u'Jas': translate('BiblesPlugin','James'),
|
||||
u'1Pet': translate('BiblesPlugin','1 Peter'),
|
||||
u'2Pet': translate('BiblesPlugin','2 Peter'),
|
||||
u'1John': translate('BiblesPlugin','1 John'),
|
||||
u'2John': translate('BiblesPlugin','2 John'),
|
||||
u'3John': translate('BiblesPlugin','3 John'),
|
||||
u'Jude': translate('BiblesPlugin','Jude'),
|
||||
u'Rev': translate('BiblesPlugin','Revelation'),
|
||||
u'Jdt': translate('BiblesPlugin','Judith'),
|
||||
u'Wis': translate('BiblesPlugin','Wisdom'),
|
||||
u'Tob': translate('BiblesPlugin','Tobit'),
|
||||
u'Sir': translate('BiblesPlugin','Sirach'),
|
||||
u'Bar': translate('BiblesPlugin','Baruch'),
|
||||
u'1Macc': translate('BiblesPlugin','1 Maccabees'),
|
||||
u'2Macc': translate('BiblesPlugin','2 Maccabees'),
|
||||
u'3Macc': translate('BiblesPlugin','3 Maccabees'),
|
||||
u'4Macc': translate('BiblesPlugin','4 Maccabees'),
|
||||
u'AddDan': translate('BiblesPlugin','Rest of Daniel'),
|
||||
u'AddEsth': translate('BiblesPlugin','Rest of Esther'),
|
||||
u'PrMan': translate('BiblesPlugin','Prayer of Manasses'),
|
||||
u'LetJer': translate('BiblesPlugin','Letter of Jeremiah'),
|
||||
u'PrAza': translate('BiblesPlugin','Prayer of Azariah'),
|
||||
u'Sus': translate('BiblesPlugin','Susanna'),
|
||||
u'Bel': translate('BiblesPlugin','Bel'),
|
||||
u'1Esdr': translate('BiblesPlugin','1 Esdras'),
|
||||
u'2Esdr': translate('BiblesPlugin','2 Esdras')
|
||||
u'Gen': translate('BiblesPlugin', 'Genesis'),
|
||||
u'Exod': translate('BiblesPlugin', 'Exodus'),
|
||||
u'Lev': translate('BiblesPlugin', 'Leviticus'),
|
||||
u'Num': translate('BiblesPlugin', 'Numbers'),
|
||||
u'Deut': translate('BiblesPlugin', 'Deuteronomy'),
|
||||
u'Josh': translate('BiblesPlugin', 'Joshua'),
|
||||
u'Judg': translate('BiblesPlugin', 'Judges'),
|
||||
u'Ruth': translate('BiblesPlugin', 'Ruth'),
|
||||
u'1Sam': translate('BiblesPlugin', '1 Samuel'),
|
||||
u'2Sam': translate('BiblesPlugin', '2 Samuel'),
|
||||
u'1Kgs': translate('BiblesPlugin', '1 Kings'),
|
||||
u'2Kgs': translate('BiblesPlugin', '2 Kings'),
|
||||
u'1Chr': translate('BiblesPlugin', '1 Chronicles'),
|
||||
u'2Chr': translate('BiblesPlugin', '2 Chronicles'),
|
||||
u'Esra': translate('BiblesPlugin', 'Ezra'),
|
||||
u'Neh': translate('BiblesPlugin', 'Nehemiah'),
|
||||
u'Esth': translate('BiblesPlugin', 'Esther'),
|
||||
u'Job': translate('BiblesPlugin', 'Job'),
|
||||
u'Ps': translate('BiblesPlugin', 'Psalms'),
|
||||
u'Prov': translate('BiblesPlugin', 'Proverbs'),
|
||||
u'Eccl': translate('BiblesPlugin', 'Ecclesiastes'),
|
||||
u'Song': translate('BiblesPlugin', 'Song of Solomon'),
|
||||
u'Isa': translate('BiblesPlugin', 'Isaiah'),
|
||||
u'Jer': translate('BiblesPlugin', 'Jeremiah'),
|
||||
u'Lam': translate('BiblesPlugin', 'Lamentations'),
|
||||
u'Ezek': translate('BiblesPlugin', 'Ezekiel'),
|
||||
u'Dan': translate('BiblesPlugin', 'Daniel'),
|
||||
u'Hos': translate('BiblesPlugin', 'Hosea'),
|
||||
u'Joel': translate('BiblesPlugin', 'Joel'),
|
||||
u'Amos': translate('BiblesPlugin', 'Amos'),
|
||||
u'Obad': translate('BiblesPlugin', 'Obadiah'),
|
||||
u'Jonah': translate('BiblesPlugin', 'Jonah'),
|
||||
u'Mic': translate('BiblesPlugin', 'Micah'),
|
||||
u'Nah': translate('BiblesPlugin', 'Nahum'),
|
||||
u'Hab': translate('BiblesPlugin', 'Habakkuk'),
|
||||
u'Zeph': translate('BiblesPlugin', 'Zephaniah'),
|
||||
u'Hag': translate('BiblesPlugin', 'Haggai'),
|
||||
u'Zech': translate('BiblesPlugin', 'Zechariah'),
|
||||
u'Mal': translate('BiblesPlugin', 'Malachi'),
|
||||
u'Matt': translate('BiblesPlugin', 'Matthew'),
|
||||
u'Mark': translate('BiblesPlugin', 'Mark'),
|
||||
u'Luke': translate('BiblesPlugin', 'Luke'),
|
||||
u'John': translate('BiblesPlugin', 'John'),
|
||||
u'Acts': translate('BiblesPlugin', 'Acts'),
|
||||
u'Rom': translate('BiblesPlugin', 'Romans'),
|
||||
u'1Cor': translate('BiblesPlugin', '1 Corinthians'),
|
||||
u'2Cor': translate('BiblesPlugin', '2 Corinthians'),
|
||||
u'Gal': translate('BiblesPlugin', 'Galatians'),
|
||||
u'Eph': translate('BiblesPlugin', 'Ephesians'),
|
||||
u'Phil': translate('BiblesPlugin', 'Philippians'),
|
||||
u'Col': translate('BiblesPlugin', 'Colossians'),
|
||||
u'1Thess': translate('BiblesPlugin', '1 Thessalonians'),
|
||||
u'2Thess': translate('BiblesPlugin', '2 Thessalonians'),
|
||||
u'1Tim': translate('BiblesPlugin', '1 Timothy'),
|
||||
u'2Tim': translate('BiblesPlugin', '2 Timothy'),
|
||||
u'Titus': translate('BiblesPlugin', 'Titus'),
|
||||
u'Phlm': translate('BiblesPlugin', 'Philemon'),
|
||||
u'Heb': translate('BiblesPlugin', 'Hebrews'),
|
||||
u'Jas': translate('BiblesPlugin', 'James'),
|
||||
u'1Pet': translate('BiblesPlugin', '1 Peter'),
|
||||
u'2Pet': translate('BiblesPlugin', '2 Peter'),
|
||||
u'1John': translate('BiblesPlugin', '1 John'),
|
||||
u'2John': translate('BiblesPlugin', '2 John'),
|
||||
u'3John': translate('BiblesPlugin', '3 John'),
|
||||
u'Jude': translate('BiblesPlugin', 'Jude'),
|
||||
u'Rev': translate('BiblesPlugin', 'Revelation'),
|
||||
u'Jdt': translate('BiblesPlugin', 'Judith'),
|
||||
u'Wis': translate('BiblesPlugin', 'Wisdom'),
|
||||
u'Tob': translate('BiblesPlugin', 'Tobit'),
|
||||
u'Sir': translate('BiblesPlugin', 'Sirach'),
|
||||
u'Bar': translate('BiblesPlugin', 'Baruch'),
|
||||
u'1Macc': translate('BiblesPlugin', '1 Maccabees'),
|
||||
u'2Macc': translate('BiblesPlugin', '2 Maccabees'),
|
||||
u'3Macc': translate('BiblesPlugin', '3 Maccabees'),
|
||||
u'4Macc': translate('BiblesPlugin', '4 Maccabees'),
|
||||
u'AddDan': translate('BiblesPlugin', 'Rest of Daniel'),
|
||||
u'AddEsth': translate('BiblesPlugin', 'Rest of Esther'),
|
||||
u'PrMan': translate('BiblesPlugin', 'Prayer of Manasses'),
|
||||
u'LetJer': translate('BiblesPlugin', 'Letter of Jeremiah'),
|
||||
u'PrAza': translate('BiblesPlugin', 'Prayer of Azariah'),
|
||||
u'Sus': translate('BiblesPlugin', 'Susanna'),
|
||||
u'Bel': translate('BiblesPlugin', 'Bel'),
|
||||
u'1Esdr': translate('BiblesPlugin', '1 Esdras'),
|
||||
u'2Esdr': translate('BiblesPlugin', '2 Esdras')
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -279,9 +279,8 @@ class BiblesTab(SettingsTab):
|
|||
self.languageSelectionGroupBox.setTitle(
|
||||
translate('BiblesPlugin.BiblesTab', 'Preferred Bookname Language'))
|
||||
self.languageSelectionLabel.setText(translate('BiblesPlugin.BiblesTab',
|
||||
'Choose the language in which the book names of the\nbible should '
|
||||
'be displayed in advanced search or on\nautocompleter in quick '
|
||||
'search:'))
|
||||
'Choose the language in which the book names of the\nBible should '
|
||||
'be displayed in the Bible search:'))
|
||||
self.languageSelectionComboBox.setItemText(LanguageSelection.Bible,
|
||||
translate('BiblesPlugin.BiblesTab', 'Bible language'))
|
||||
self.languageSelectionComboBox.setItemText(
|
||||
|
|
@ -291,9 +290,9 @@ class BiblesTab(SettingsTab):
|
|||
translate('BiblesPlugin.BiblesTab', 'English'))
|
||||
self.languageSelectionComboBox.setToolTip(
|
||||
translate('BiblesPlugin.BiblesTab', 'Multiple options:\n '
|
||||
'Bible language - the language in which the bible book names '
|
||||
'was imported\n Application language - the language you have '
|
||||
'choosen for Openlp\n English - use always English booknames'))
|
||||
'Bible language - the language in which the Bible book names '
|
||||
'were imported\n Application language - the language you have '
|
||||
'chosen for OpenLP\n English - always use English book names'))
|
||||
|
||||
def onBibleThemeComboBoxChanged(self):
|
||||
self.bible_theme = self.bibleThemeComboBox.currentText()
|
||||
|
|
|
|||
|
|
@ -609,7 +609,7 @@ class BiblesResourcesDB(QtCore.QObject, Manager):
|
|||
books = BiblesResourcesDB.run_sql(u'SELECT id, testament_id, name, '
|
||||
u'abbreviation, chapters FROM book_reference WHERE '
|
||||
u'LOWER(name) LIKE ? OR LOWER(abbreviation) LIKE ?',
|
||||
(u'%'+string.lower()+u'%', u'%'+string.lower()+u'%'))
|
||||
(u'%' + string.lower() + u'%', u'%' + string.lower() + u'%'))
|
||||
if books:
|
||||
return [
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue