raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix some mission spaces and addapt some strings

This commit is contained in:
Armin Köhler 2012-03-10 20:12:03 +01:00
parent 905fc6d91f
commit 06cce54788
3 changed files with 90 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
openlp/plugins/bibles/lib/__init__.py
View File

@ -89,90 +89,90 @@ class BibleStrings(object):
These strings should need a good reason to be retranslated elsewhere. These strings should need a good reason to be retranslated elsewhere.
""" """
self.Booknames = { self.Booknames = {
u'Gen': translate('BiblesPlugin','Genesis'), u'Gen': translate('BiblesPlugin', 'Genesis'),
u'Exod': translate('BiblesPlugin','Exodus'), u'Exod': translate('BiblesPlugin', 'Exodus'),
u'Lev': translate('BiblesPlugin','Leviticus'), u'Lev': translate('BiblesPlugin', 'Leviticus'),
u'Num': translate('BiblesPlugin','Numbers'), u'Num': translate('BiblesPlugin', 'Numbers'),
u'Deut': translate('BiblesPlugin','Deuteronomy'), u'Deut': translate('BiblesPlugin', 'Deuteronomy'),
u'Josh': translate('BiblesPlugin','Joshua'), u'Josh': translate('BiblesPlugin', 'Joshua'),
u'Judg': translate('BiblesPlugin','Judges'), u'Judg': translate('BiblesPlugin', 'Judges'),
u'Ruth': translate('BiblesPlugin','Ruth'), u'Ruth': translate('BiblesPlugin', 'Ruth'),
u'1Sam': translate('BiblesPlugin','1 Samuel'), u'1Sam': translate('BiblesPlugin', '1 Samuel'),
u'2Sam': translate('BiblesPlugin','2 Samuel'), u'2Sam': translate('BiblesPlugin', '2 Samuel'),
u'1Kgs': translate('BiblesPlugin','1 Kings'), u'1Kgs': translate('BiblesPlugin', '1 Kings'),
u'2Kgs': translate('BiblesPlugin','2 Kings'), u'2Kgs': translate('BiblesPlugin', '2 Kings'),
u'1Chr': translate('BiblesPlugin','1 Chronicles'), u'1Chr': translate('BiblesPlugin', '1 Chronicles'),
u'2Chr': translate('BiblesPlugin','2 Chronicles'), u'2Chr': translate('BiblesPlugin', '2 Chronicles'),
u'Esra': translate('BiblesPlugin','Ezra'), u'Esra': translate('BiblesPlugin', 'Ezra'),
u'Neh': translate('BiblesPlugin','Nehemiah'), u'Neh': translate('BiblesPlugin', 'Nehemiah'),
u'Esth': translate('BiblesPlugin','Esther'), u'Esth': translate('BiblesPlugin', 'Esther'),
u'Job': translate('BiblesPlugin','Job'), u'Job': translate('BiblesPlugin', 'Job'),
u'Ps': translate('BiblesPlugin','Psalms'), u'Ps': translate('BiblesPlugin', 'Psalms'),
u'Prov': translate('BiblesPlugin','Proverbs'), u'Prov': translate('BiblesPlugin', 'Proverbs'),
u'Eccl': translate('BiblesPlugin','Ecclesiastes'), u'Eccl': translate('BiblesPlugin', 'Ecclesiastes'),
u'Song': translate('BiblesPlugin','Song of Solomon'), u'Song': translate('BiblesPlugin', 'Song of Solomon'),
u'Isa': translate('BiblesPlugin','Isaiah'), u'Isa': translate('BiblesPlugin', 'Isaiah'),
u'Jer': translate('BiblesPlugin','Jeremiah'), u'Jer': translate('BiblesPlugin', 'Jeremiah'),
u'Lam': translate('BiblesPlugin','Lamentations'), u'Lam': translate('BiblesPlugin', 'Lamentations'),
u'Ezek': translate('BiblesPlugin','Ezekiel'), u'Ezek': translate('BiblesPlugin', 'Ezekiel'),
u'Dan': translate('BiblesPlugin','Daniel'), u'Dan': translate('BiblesPlugin', 'Daniel'),
u'Hos': translate('BiblesPlugin','Hosea'), u'Hos': translate('BiblesPlugin', 'Hosea'),
u'Joel': translate('BiblesPlugin','Joel'), u'Joel': translate('BiblesPlugin', 'Joel'),
u'Amos': translate('BiblesPlugin','Amos'), u'Amos': translate('BiblesPlugin', 'Amos'),
u'Obad': translate('BiblesPlugin','Obadiah'), u'Obad': translate('BiblesPlugin', 'Obadiah'),
u'Jonah': translate('BiblesPlugin','Jonah'), u'Jonah': translate('BiblesPlugin', 'Jonah'),
u'Mic': translate('BiblesPlugin','Micah'), u'Mic': translate('BiblesPlugin', 'Micah'),
u'Nah': translate('BiblesPlugin','Nahum'), u'Nah': translate('BiblesPlugin', 'Nahum'),
u'Hab': translate('BiblesPlugin','Habakkuk'), u'Hab': translate('BiblesPlugin', 'Habakkuk'),
u'Zeph': translate('BiblesPlugin','Zephaniah'), u'Zeph': translate('BiblesPlugin', 'Zephaniah'),
u'Hag': translate('BiblesPlugin','Haggai'), u'Hag': translate('BiblesPlugin', 'Haggai'),
u'Zech': translate('BiblesPlugin','Zechariah'), u'Zech': translate('BiblesPlugin', 'Zechariah'),
u'Mal': translate('BiblesPlugin','Malachi'), u'Mal': translate('BiblesPlugin', 'Malachi'),
u'Matt': translate('BiblesPlugin','Matthew'), u'Matt': translate('BiblesPlugin', 'Matthew'),
u'Mark': translate('BiblesPlugin','Mark'), u'Mark': translate('BiblesPlugin', 'Mark'),
u'Luke': translate('BiblesPlugin','Luke'), u'Luke': translate('BiblesPlugin', 'Luke'),
u'John': translate('BiblesPlugin','John'), u'John': translate('BiblesPlugin', 'John'),
u'Acts': translate('BiblesPlugin','Acts'), u'Acts': translate('BiblesPlugin', 'Acts'),
u'Rom': translate('BiblesPlugin','Romans'), u'Rom': translate('BiblesPlugin', 'Romans'),
u'1Cor': translate('BiblesPlugin','1 Corinthians'), u'1Cor': translate('BiblesPlugin', '1 Corinthians'),
u'2Cor': translate('BiblesPlugin','2 Corinthians'), u'2Cor': translate('BiblesPlugin', '2 Corinthians'),
u'Gal': translate('BiblesPlugin','Galatians'), u'Gal': translate('BiblesPlugin', 'Galatians'),
u'Eph': translate('BiblesPlugin','Ephesians'), u'Eph': translate('BiblesPlugin', 'Ephesians'),
u'Phil': translate('BiblesPlugin','Philippians'), u'Phil': translate('BiblesPlugin', 'Philippians'),
u'Col': translate('BiblesPlugin','Colossians'), u'Col': translate('BiblesPlugin', 'Colossians'),
u'1Thess': translate('BiblesPlugin','1 Thessalonians'), u'1Thess': translate('BiblesPlugin', '1 Thessalonians'),
u'2Thess': translate('BiblesPlugin','2 Thessalonians'), u'2Thess': translate('BiblesPlugin', '2 Thessalonians'),
u'1Tim': translate('BiblesPlugin','1 Timothy'), u'1Tim': translate('BiblesPlugin', '1 Timothy'),
u'2Tim': translate('BiblesPlugin','2 Timothy'), u'2Tim': translate('BiblesPlugin', '2 Timothy'),
u'Titus': translate('BiblesPlugin','Titus'), u'Titus': translate('BiblesPlugin', 'Titus'),
u'Phlm': translate('BiblesPlugin','Philemon'), u'Phlm': translate('BiblesPlugin', 'Philemon'),
u'Heb': translate('BiblesPlugin','Hebrews'), u'Heb': translate('BiblesPlugin', 'Hebrews'),
u'Jas': translate('BiblesPlugin','James'), u'Jas': translate('BiblesPlugin', 'James'),
u'1Pet': translate('BiblesPlugin','1 Peter'), u'1Pet': translate('BiblesPlugin', '1 Peter'),
u'2Pet': translate('BiblesPlugin','2 Peter'), u'2Pet': translate('BiblesPlugin', '2 Peter'),
u'1John': translate('BiblesPlugin','1 John'), u'1John': translate('BiblesPlugin', '1 John'),
u'2John': translate('BiblesPlugin','2 John'), u'2John': translate('BiblesPlugin', '2 John'),
u'3John': translate('BiblesPlugin','3 John'), u'3John': translate('BiblesPlugin', '3 John'),
u'Jude': translate('BiblesPlugin','Jude'), u'Jude': translate('BiblesPlugin', 'Jude'),
u'Rev': translate('BiblesPlugin','Revelation'), u'Rev': translate('BiblesPlugin', 'Revelation'),
u'Jdt': translate('BiblesPlugin','Judith'), u'Jdt': translate('BiblesPlugin', 'Judith'),
u'Wis': translate('BiblesPlugin','Wisdom'), u'Wis': translate('BiblesPlugin', 'Wisdom'),
u'Tob': translate('BiblesPlugin','Tobit'), u'Tob': translate('BiblesPlugin', 'Tobit'),
u'Sir': translate('BiblesPlugin','Sirach'), u'Sir': translate('BiblesPlugin', 'Sirach'),
u'Bar': translate('BiblesPlugin','Baruch'), u'Bar': translate('BiblesPlugin', 'Baruch'),
u'1Macc': translate('BiblesPlugin','1 Maccabees'), u'1Macc': translate('BiblesPlugin', '1 Maccabees'),
u'2Macc': translate('BiblesPlugin','2 Maccabees'), u'2Macc': translate('BiblesPlugin', '2 Maccabees'),
u'3Macc': translate('BiblesPlugin','3 Maccabees'), u'3Macc': translate('BiblesPlugin', '3 Maccabees'),
u'4Macc': translate('BiblesPlugin','4 Maccabees'), u'4Macc': translate('BiblesPlugin', '4 Maccabees'),
u'AddDan': translate('BiblesPlugin','Rest of Daniel'), u'AddDan': translate('BiblesPlugin', 'Rest of Daniel'),
u'AddEsth': translate('BiblesPlugin','Rest of Esther'), u'AddEsth': translate('BiblesPlugin', 'Rest of Esther'),
u'PrMan': translate('BiblesPlugin','Prayer of Manasses'), u'PrMan': translate('BiblesPlugin', 'Prayer of Manasses'),
u'LetJer': translate('BiblesPlugin','Letter of Jeremiah'), u'LetJer': translate('BiblesPlugin', 'Letter of Jeremiah'),
u'PrAza': translate('BiblesPlugin','Prayer of Azariah'), u'PrAza': translate('BiblesPlugin', 'Prayer of Azariah'),
u'Sus': translate('BiblesPlugin','Susanna'), u'Sus': translate('BiblesPlugin', 'Susanna'),
u'Bel': translate('BiblesPlugin','Bel'), u'Bel': translate('BiblesPlugin', 'Bel'),
u'1Esdr': translate('BiblesPlugin','1 Esdras'), u'1Esdr': translate('BiblesPlugin', '1 Esdras'),
u'2Esdr': translate('BiblesPlugin','2 Esdras') u'2Esdr': translate('BiblesPlugin', '2 Esdras')
} }

11
openlp/plugins/bibles/lib/biblestab.py
View File

@ -279,9 +279,8 @@ class BiblesTab(SettingsTab):
self.languageSelectionGroupBox.setTitle( self.languageSelectionGroupBox.setTitle(
translate('BiblesPlugin.BiblesTab', 'Preferred Bookname Language')) translate('BiblesPlugin.BiblesTab', 'Preferred Bookname Language'))
self.languageSelectionLabel.setText(translate('BiblesPlugin.BiblesTab', self.languageSelectionLabel.setText(translate('BiblesPlugin.BiblesTab',
'Choose the language in which the book names of the\nbible should ' 'Choose the language in which the book names of the\nBible should '
'be displayed in advanced search or on\nautocompleter in quick ' 'be displayed in the Bible search:'))
'search:'))
self.languageSelectionComboBox.setItemText(LanguageSelection.Bible, self.languageSelectionComboBox.setItemText(LanguageSelection.Bible,
translate('BiblesPlugin.BiblesTab', 'Bible language')) translate('BiblesPlugin.BiblesTab', 'Bible language'))
self.languageSelectionComboBox.setItemText( self.languageSelectionComboBox.setItemText(
@ -291,9 +290,9 @@ class BiblesTab(SettingsTab):
translate('BiblesPlugin.BiblesTab', 'English')) translate('BiblesPlugin.BiblesTab', 'English'))
self.languageSelectionComboBox.setToolTip( self.languageSelectionComboBox.setToolTip(
translate('BiblesPlugin.BiblesTab', 'Multiple options:\n ' translate('BiblesPlugin.BiblesTab', 'Multiple options:\n '
'Bible language - the language in which the bible book names ' 'Bible language - the language in which the Bible book names '
'was imported\n Application language - the language you have ' 'were imported\n Application language - the language you have '
'choosen for Openlp\n English - use always English booknames')) 'chosen for OpenLP\n English - always use English book names'))
def onBibleThemeComboBoxChanged(self): def onBibleThemeComboBoxChanged(self):
self.bible_theme = self.bibleThemeComboBox.currentText() self.bible_theme = self.bibleThemeComboBox.currentText()

2
openlp/plugins/bibles/lib/db.py
View File

@ -609,7 +609,7 @@ class BiblesResourcesDB(QtCore.QObject, Manager):
books = BiblesResourcesDB.run_sql(u'SELECT id, testament_id, name, ' books = BiblesResourcesDB.run_sql(u'SELECT id, testament_id, name, '
u'abbreviation, chapters FROM book_reference WHERE ' u'abbreviation, chapters FROM book_reference WHERE '
u'LOWER(name) LIKE ? OR LOWER(abbreviation) LIKE ?', 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: if books:
return [ return [
{ {