Head r1910

openlp/core/ui/advancedtab.py

@@ -53,13 +53,10 @@ class AdvancedTab(SettingsTab):
         self.defaultServiceMinute = 0
         self.defaultServiceName = unicode(translate('OpenLP.AdvancedTab',
             'Service %Y-%m-%d %H-%M',
-            'This is the default default service name template, which can be '
-            'found under Advanced in Settings, Configure OpenLP. Please do not '
-            'include any of the following characters: /\\?*|<>\[\]":+\n'
-            'You can use any of the directives as shown on page '
-            'http://docs.python.org/library/datetime.html'
-            '#strftime-strptime-behavior , but if possible, please keep '
-            'the resulting string sortable by name.'))
+            'This may not contain any of the following characters: '
+            '/\\?*|<>\[\]":+\n'
+            'See http://docs.python.org/library/datetime.html'
+            '#strftime-strptime-behavior for more information.'))
         self.defaultImage = u':/graphics/openlp-splash-screen.png'
         self.defaultColor = u'#ffffff'
         self.icon_path = u':/system/system_settings.png'

openlp/core/ui/servicemanager.py

@@ -609,16 +609,11 @@ class ServiceManager(QtGui.QWidget):
                 time = time.replace(hour=service_hour, minute=service_minute)
             default_pattern = unicode(QtCore.QSettings().value(
                 u'advanced/default service name',
-                translate('OpenLP.AdvancedTab',
-                'Service %Y-%m-%d %H-%M',
-                'This is the default default service name template, which can '
-                'be found under Advanced in Settings, Configure OpenLP. '
-                'Please do not include any of the following characters: '
-                '/\\?*|<>\[\]":+\n'
-                'You can use any of the directives as shown on page '
-                'http://docs.python.org/library/datetime.html'
-                '#strftime-strptime-behavior , but if possible, please keep '
-                'the resulting string sortable by name.')).toString())
+                translate('OpenLP.AdvancedTab', 'Service %Y-%m-%d %H-%M',
+                    'This may not contain any of the following characters: '
+                    '/\\?*|<>\[\]":+\nSee http://docs.python.org/library/'
+                    'datetime.html#strftime-strptime-behavior for more '
+                    'information.')).toString())
             default_filename = time.strftime(default_pattern)
         else:
             default_filename = u''

openlp/plugins/bibles/lib/__init__.py

@@ -183,13 +183,8 @@ def update_reference_separators():
     """
     default_separators = unicode(translate('BiblesPlugin',
         ':|v|V|verse|verses;;-|to;;,|and;;end',
-        'This are 4 values seperated each by two semicolons representing the '
-        'seperators for parsing references. This values are verse separators, '
-        'range separators, list separators and end mark. Alternative values '
-        'to be seperated by a vertical bar "|". In this case the first value '
-        'is the default and used for the display format. If a semicolon should '
-        'be used you have to give an alternative separator afterwards to allow '
-        'OpenLP correct splitting of the translation.')).split(u';;')
+        'Double-semicolon delimited separators for parsing references. '
+        'Consult the developers for further information.')).split(u';;')
     settings = QtCore.QSettings()
     settings.beginGroup(u'bibles')
     custom_separators = [

openlp/plugins/custom/lib/mediaitem.py

@@ -177,7 +177,7 @@ class CustomMediaItem(MediaManagerItem):
                 UiStrings().ConfirmDelete,
                 translate('CustomPlugin.MediaItem',
                 'Are you sure you want to delete the %n selected custom'
-                ' slides(s)?', '',
+                ' slide(s)?', '',
                 QtCore.QCoreApplication.CodecForTr, len(items)),
                 QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.Yes |
                 QtGui.QMessageBox.No),

scripts/translation_utils.py

@@ -185,11 +185,11 @@ def download_translations():
     **Note:** URLs and headers need to remain strings, not unicode.
     """
     global username, password
-    if not username:
-        username = raw_input(u'Transifex username: ')
-    if not password:
-        password = getpass(u'Transifex password: ')
     print_quiet(u'Download translation files from Transifex')
+    if not username:
+        username = raw_input(u'   Transifex username: ')
+    if not password:
+        password = getpass(u'   Transifex password: ')
     # First get the list of languages
     url = SERVER_URL + 'resource/ents/'
     base64string = base64.encodestring(