r1356

openlp/core/ui/aboutdialog.py

@@ -108,19 +108,40 @@ class Ui_AboutDialog(object):
             self.aboutNotebook.indexOf(self.aboutTab), UiStrings.About)
         lead = u'Raoul "superfly" Snyman'
         developers = [u'Tim "TRB143" Bentley', u'Jonathan "gushie" Corwin',
-            u'Michael "cocooncrash" Gorven', u'Scott "sguerrieri" Guerrieri',
+            u'Michael "cocooncrash" Gorven',
-            u'Raoul "superfly" Snyman', u'Martin "mijiti" Thompson',
+            u'Andreas "googol" Preikschat', u'Raoul "superfly" Snyman',
-            u'Jon "Meths" Tibble<']
+            u'Martin "mijiti" Thompson', u'Jon "Meths" Tibble']
-        contributors = [u'Meinert "m2j" Jordan', u'Andreas "googol" Preikschat',
+        contributors = [u'Scott "sguerrieri" Guerrieri',
+            u'Meinert "m2j" Jordan', u'Armin "orangeshirt" K\xf6hler',
             u'Christian "crichter" Richter', u'Philip "Phill" Ridout',
-            u'Maikel Stuivenberg', u'Carsten "catini" Tingaard',
+            u'Jeffrey "whydoubt" Smith', u'Maikel Stuivenberg',
-            u'Frode "frodus" Woldsund']
+            u'Carsten "catini" Tingaard', u'Frode "frodus" Woldsund']
-        testers = [u'Philip "Phill" Ridout', u'Wesley "wrst" Stout (lead)']
+        testers = [u'Philip "Phill" Ridout', u'Wesley "wrst" Stout',
-        packagers = [u'Thomas "tabthorpe" Abthorpe (FreeBSD)',
+            u'John "jseagull1" Cegalis (lead)']
+        packagers = ['Thomas "tabthorpe" Abthorpe (FreeBSD)',
             u'Tim "TRB143" Bentley (Fedora)',
             u'Michael "cocooncrash" Gorven (Ubuntu)',
             u'Matthias "matthub" Hub (Mac OS X)',
             u'Raoul "superfly" Snyman (Windows, Ubuntu)']
+        translators = {
+            u'af': [u'Johan "nuvolari" Mynhardt'],
+            u'de': [u'Patrick "madmuffin" Br\xfcckner',
+                u'Meinert "m2j" Jordan',
+                u'Andreas "googol" Preikschat',
+                u'Christian "crichter" Richter'],
+            u'en_GB': [u'Tim "TRB143" Bentley', u'Jonathan "gushie" Corwin'],
+            u'en_ZA': [u'Raoul "superfly" Snyman'],
+            u'et': [u'Mattias "mahfiaz" P\xf5ldaru'],
+            u'fr': [u'Stephan\xe9 "stbrunner" Brunner'],
+            u'hu': [u'Gyuris Gellért'],
+            u'ja': [u'Kunio "Kunio" Nakamaru'],
+            u'nb': [u'Atle "pendlaren" Weibell', u'Frode "frodus" Woldsund'],
+            u'nl': [u'Arjen "typovar" van Voorst'],
+            u'pt_BR': [u'Rafael "rafaellerm" Lerm'],
+            u'ru': [u'Sergey "ratz" Ratz']
+        }
+        documentors = [u'Wesley "wrst" Stout',
+            u'John "jseagull1" Cegalis (lead)']
         self.creditsTextEdit.setPlainText(unicode(translate('OpenLP.AboutForm',
             'Project Lead\n'
             '    %s\n'
@@ -137,6 +158,35 @@ class Ui_AboutDialog(object):
             'Packagers\n'
             '    %s\n'
             '\n'
+            'Translators\n'
+            '    Afrikaans (af)\n'
+            '        %s\n'
+            '    German (de)\n'
+            '        %s\n'
+            '    English, United Kingdom (en_GB)\n'
+            '        %s\n'
+            '    English, South Africa (en_ZA)\n'
+            '        %s\n'
+            '    Estonian (et)\n'
+            '        %s\n'
+            '    French (fr)\n'
+            '        %s\n'
+            '    Hungarian (hu)\n'
+            '        %s\n'
+            '    Japanese (ja)\n'
+            '        %s\n'
+            '    Norwegian Bokm\xe5l (nb)\n'
+            '        %s\n'
+            '    Dutch (nl)\n'
+            '        %s\n'
+            '    Portuguese, Brazil (pt_BR)\n'
+            '        %s\n'
+            '    Russian (ru)\n'
+            '        %s\n'
+            '\n'
+            'Documentation\n'
+            '    %s\n'
+            '\n'
             'Built With\n'
             '    Python: http://www.python.org/\n'
             '    Qt4: http://qt.nokia.com/\n'
@@ -155,7 +205,19 @@ class Ui_AboutDialog(object):
             '    bring this software to you for free because\n'
             '    He has set us free.')) % (lead, u'\n    '.join(developers),
             u'\n    '.join(contributors), u'\n    '.join(testers),
-            u'\n    '.join(packagers)))
+            u'\n    '.join(packagers), u'\n        '.join(translators[u'af']),
+            u'\n        '.join(translators[u'de']),
+            u'\n        '.join(translators[u'en_GB']),
+            u'\n        '.join(translators[u'en_ZA']),
+            u'\n        '.join(translators[u'et']),
+            u'\n        '.join(translators[u'fr']),
+            u'\n        '.join(translators[u'hu']),
+            u'\n        '.join(translators[u'ja']),
+            u'\n        '.join(translators[u'nb']),
+            u'\n        '.join(translators[u'nl']),
+            u'\n        '.join(translators[u'pt_BR']),
+            u'\n        '.join(translators[u'ru']),
+            u'\n    '.join(documentors)))
         self.aboutNotebook.setTabText(
             self.aboutNotebook.indexOf(self.creditsTab),
             translate('OpenLP.AboutForm', 'Credits'))

openlp/core/ui/screen.py

@@ -123,7 +123,7 @@ class ScreenList(object):
 
             [u'Screen 1 (primary)', u'Screen 2']
         """
-        screen_list= []
+        screen_list = []
         for screen in self.screen_list:
             screen_name = u'%s %d' % (translate('OpenLP.ScreenList', 'Screen'),
                 screen[u'number'] + 1)

openlp/core/ui/servicemanager.py

@@ -943,6 +943,7 @@ class ServiceManager(QtGui.QWidget):
         for item in self.serviceItems:
             if item[u'service_item']._uuid == uuid:
                 item[u'service_item'].edit_id = editId
+        self.setModified(True)
 
     def replaceServiceItem(self, newItem):
         """
@@ -1123,13 +1124,14 @@ class ServiceManager(QtGui.QWidget):
                 self.serviceItems.remove(serviceItem)
                 self.serviceItems.insert(endpos, serviceItem)
                 self.repaintServiceList(endpos, child)
+                self.setModified(True)
             else:
                 # we are not over anything so drop
                 replace = False
                 if item is None:
                     self.dropPosition = len(self.serviceItems)
                 else:
-                    # we are over somthing so lets investigate
+                    # we are over something so lets investigate
                     pos = self._getParentItemData(item) - 1
                     serviceItem = self.serviceItems[pos]
                     if (plugin == serviceItem[u'service_item'].name and

openlp/plugins/bibles/forms/bibleimportform.py

@@ -568,7 +568,8 @@ class BibleImportForm(OpenLPWizard):
         """
         self.getFileName(WizardStrings.OpenTypeFile % UiStrings.OLPV1,
             self.openlp1FileEdit, u'%s (*.bible)' %
-            translate('BiblesPlugin.ImportWizardForm', 'openlp.org 1.x Bible Files'))
+            translate('BiblesPlugin.ImportWizardForm',
+            'openlp.org 1.x Bible Files'))
 
     def registerFields(self):
         """

openlp/plugins/bibles/lib/csvbible.py

@@ -69,8 +69,6 @@ import logging
 import chardet
 import csv
 
-from PyQt4 import QtCore
-
 from openlp.core.lib import Receiver, translate
 from openlp.plugins.bibles.lib.db import BibleDB, Testament
 

openlp/plugins/bibles/lib/openlp1.py

@@ -27,8 +27,6 @@
 import logging
 import sqlite
 
-from PyQt4 import QtCore
-
 from openlp.core.lib import Receiver
 from openlp.core.ui.wizard import WizardStrings
 from openlp.plugins.bibles.lib.db import BibleDB

openlp/plugins/bibles/lib/opensong.py

@@ -25,9 +25,7 @@
 ###############################################################################
 
 import logging
-
 from lxml import objectify
-from PyQt4 import QtCore
 
 from openlp.core.lib import Receiver, translate
 from openlp.plugins.bibles.lib.db import BibleDB

openlp/plugins/bibles/lib/osis.py

@@ -31,8 +31,6 @@ import chardet
 import codecs
 import re
 
-from PyQt4 import QtCore
-
 from openlp.core.lib import Receiver, translate
 from openlp.core.utils import AppLocation
 from openlp.plugins.bibles.lib.db import BibleDB

openlp/plugins/songs/forms/songexportform.py

@@ -355,7 +355,8 @@ class SongExportForm(OpenLPWizard):
         the path to *directoryLineEdit*.
         """
         path = unicode(QtGui.QFileDialog.getExistingDirectory(self,
-            translate('SongsPlugin.ExportWizardForm', 'Select Destination Folder'),
+            translate('SongsPlugin.ExportWizardForm',
+            'Select Destination Folder'),
             SettingsManager.get_last_dir(self.plugin.settingsSection, 1),
             options=QtGui.QFileDialog.ShowDirsOnly))
         SettingsManager.set_last_dir(self.plugin.settingsSection, path, 1)