openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/bug-734445 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/bug-734445/+merge/64315

Fixed various strings.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/bug-734445/+merge/64315
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/bug-734445 into lp:openlp.

=== modified file 'openlp/core/ui/pluginform.py'
--- openlp/core/ui/pluginform.py	2011-06-05 18:46:00 +0000
+++ openlp/core/ui/pluginform.py	2011-06-11 21:54:34 +0000
@@ -114,7 +114,7 @@
             self._clearDetails()
             return
         plugin_name_singular = \
-            self.pluginListWidget.currentItem().text().split(u' ')[0]
+            self.pluginListWidget.currentItem().text().split(u'(')[0][:-1]
         self.activePlugin = None
         for plugin in self.parent().pluginManager.plugins:
             if plugin.nameStrings[u'singular'] == plugin_name_singular:

=== modified file 'openlp/plugins/custom/customplugin.py'
--- openlp/plugins/custom/customplugin.py	2011-05-27 09:34:14 +0000
+++ openlp/plugins/custom/customplugin.py	2011-06-11 21:54:34 +0000
@@ -46,7 +46,7 @@
     log.info(u'Custom Plugin loaded')
 
     def __init__(self, plugin_helpers):
-        Plugin.__init__(self, u'Custom', plugin_helpers,
+        Plugin.__init__(self, u'Custom Slide', plugin_helpers,
             CustomMediaItem, CustomTab)
         self.weight = -5
         self.manager = Manager(u'custom', init_schema)
@@ -54,11 +54,11 @@
         self.icon = build_icon(self.icon_path)
 
     def about(self):
-        about_text = translate('CustomPlugin', '<strong>Custom Plugin</strong>'
-            '<br />The custom plugin provides the ability to set up custom '
-            'text slides that can be displayed on the screen the same way '
-            'songs are. This plugin provides greater freedom over the songs '
-            'plugin.')
+        about_text = translate('CustomPlugin', '<strong>Custom Slide Plugin'
+            '</strong><br />The custom slide plugin provides the ability to '
+            'set up custom text slides that can be displayed on the screen '
+            'the same way songs are. This plugin provides greater freedom '
+            'over the songs plugin.')
         return about_text
 
     def usesTheme(self, theme):
@@ -95,27 +95,31 @@
         """
         ## Name PluginList ##
         self.textStrings[StringContent.Name] = {
-            u'singular': translate('CustomsPlugin', 'Custom', 'name singular'),
-            u'plural': translate('CustomsPlugin', 'Customs', 'name plural')
+            u'singular': translate('CustomPlugin', 'Custom Slide',
+                                   'name singular'),
+            u'plural': translate('CustomPlugin', 'Custom Slides',
+                                 'name plural')
         }
         ## Name for MediaDockManager, SettingsManager ##
         self.textStrings[StringContent.VisibleName] = {
-            u'title': translate('CustomsPlugin', 'Custom', 'container title')
+            u'title': translate('CustomPlugin', 'Custom Slides',
+                'container title')
         }
         # Middle Header Bar
         tooltips = {
-            u'load': translate('CustomsPlugin', 'Load a new Custom.'),
-            u'import': translate('CustomsPlugin', 'Import a Custom.'),
-            u'new': translate('CustomsPlugin', 'Add a new Custom.'),
-            u'edit': translate('CustomsPlugin', 'Edit the selected Custom.'),
-            u'delete': translate('CustomsPlugin',
-                'Delete the selected Custom.'),
-            u'preview': translate('CustomsPlugin',
-                'Preview the selected Custom.'),
-            u'live': translate('CustomsPlugin',
-                'Send the selected Custom live.'),
-            u'service': translate('CustomsPlugin',
-                'Add the selected Custom to the service.')
+            u'load': translate('CustomPlugin', 'Load a new custom slide.'),
+            u'import': translate('CustomPlugin', 'Import a custom slide.'),
+            u'new': translate('CustomPlugin', 'Add a new custom slide.'),
+            u'edit': translate('CustomPlugin',
+                'Edit the selected custom slide.'),
+            u'delete': translate('CustomPlugin',
+                'Delete the selected custom slide.'),
+            u'preview': translate('CustomPlugin',
+                'Preview the selected custom slide.'),
+            u'live': translate('CustomPlugin',
+                'Send the selected custom slide live.'),
+            u'service': translate('CustomPlugin',
+                'Add the selected custom slide to the service.')
         }
         self.setPluginUiTextStrings(tooltips)
 

=== modified file 'openlp/plugins/images/imageplugin.py'
--- openlp/plugins/images/imageplugin.py	2011-05-26 17:11:22 +0000
+++ openlp/plugins/images/imageplugin.py	2011-06-11 21:54:34 +0000
@@ -70,14 +70,14 @@
         }
         # Middle Header Bar
         tooltips = {
-            u'load': translate('ImagePlugin', 'Load a new Image.'),
+            u'load': translate('ImagePlugin', 'Load a new image.'),
             u'import': u'',
-            u'new': translate('ImagePlugin', 'Add a new Image.'),
-            u'edit': translate('ImagePlugin', 'Edit the selected Image.'),
-            u'delete': translate('ImagePlugin', 'Delete the selected Image.'),
-            u'preview': translate('ImagePlugin', 'Preview the selected Image.'),
-            u'live': translate('ImagePlugin', 'Send the selected Image live.'),
+            u'new': translate('ImagePlugin', 'Add a new image.'),
+            u'edit': translate('ImagePlugin', 'Edit the selected image.'),
+            u'delete': translate('ImagePlugin', 'Delete the selected image.'),
+            u'preview': translate('ImagePlugin', 'Preview the selected image.'),
+            u'live': translate('ImagePlugin', 'Send the selected image live.'),
             u'service': translate('ImagePlugin',
-                'Add the selected Image to the service.')
+                'Add the selected image to the service.')
         }
         self.setPluginUiTextStrings(tooltips)

=== modified file 'openlp/plugins/media/mediaplugin.py'
--- openlp/plugins/media/mediaplugin.py	2011-05-26 17:11:22 +0000
+++ openlp/plugins/media/mediaplugin.py	2011-06-11 21:54:34 +0000
@@ -112,14 +112,14 @@
         }
         # Middle Header Bar
         tooltips = {
-            u'load': translate('MediaPlugin', 'Load a new Media.'),
+            u'load': translate('MediaPlugin', 'Load a new media.'),
             u'import': u'',
-            u'new': translate('MediaPlugin', 'Add a new Media.'),
-            u'edit': translate('MediaPlugin', 'Edit the selected Media.'),
-            u'delete': translate('MediaPlugin', 'Delete the selected Media.'),
-            u'preview': translate('MediaPlugin', 'Preview the selected Media.'),
-            u'live': translate('MediaPlugin', 'Send the selected Media live.'),
+            u'new': translate('MediaPlugin', 'Add a new media.'),
+            u'edit': translate('MediaPlugin', 'Edit the selected media.'),
+            u'delete': translate('MediaPlugin', 'Delete the selected media.'),
+            u'preview': translate('MediaPlugin', 'Preview the selected media.'),
+            u'live': translate('MediaPlugin', 'Send the selected media live.'),
             u'service': translate('MediaPlugin',
-                'Add the selected Media to the service.')
+                'Add the selected media to the service.')
         }
         self.setPluginUiTextStrings(tooltips)

=== modified file 'openlp/plugins/presentations/presentationplugin.py'
--- openlp/plugins/presentations/presentationplugin.py	2011-06-03 06:52:16 +0000
+++ openlp/plugins/presentations/presentationplugin.py	2011-06-11 21:54:34 +0000
@@ -169,17 +169,17 @@
         # Middle Header Bar
         tooltips = {
             u'load': translate('PresentationPlugin',
-                'Load a new Presentation.'),
+                'Load a new presentation.'),
             u'import': u'',
             u'new': u'',
             u'edit': u'',
             u'delete': translate('PresentationPlugin',
-                'Delete the selected Presentation.'),
+                'Delete the selected presentation.'),
             u'preview': translate('PresentationPlugin',
-                'Preview the selected Presentation.'),
+                'Preview the selected presentation.'),
             u'live': translate('PresentationPlugin',
-                'Send the selected Presentation live.'),
+                'Send the selected presentation live.'),
             u'service': translate('PresentationPlugin',
-                'Add the selected Presentation to the service.')
+                'Add the selected presentation to the service.')
         }
         self.setPluginUiTextStrings(tooltips)

=== modified file 'openlp/plugins/songs/songsplugin.py'
--- openlp/plugins/songs/songsplugin.py	2011-05-26 17:11:22 +0000
+++ openlp/plugins/songs/songsplugin.py	2011-06-11 21:54:34 +0000
@@ -215,13 +215,13 @@
         tooltips = {
             u'load': u'',
             u'import': u'',
-            u'new': translate('SongsPlugin', 'Add a new Song.'),
-            u'edit': translate('SongsPlugin', 'Edit the selected Song.'),
-            u'delete': translate('SongsPlugin', 'Delete the selected Song.'),
-            u'preview': translate('SongsPlugin', 'Preview the selected Song.'),
-            u'live': translate('SongsPlugin', 'Send the selected Song live.'),
+            u'new': translate('SongsPlugin', 'Add a new song.'),
+            u'edit': translate('SongsPlugin', 'Edit the selected song.'),
+            u'delete': translate('SongsPlugin', 'Delete the selected song.'),
+            u'preview': translate('SongsPlugin', 'Preview the selected song.'),
+            u'live': translate('SongsPlugin', 'Send the selected song live.'),
             u'service': translate('SongsPlugin',
-                'Add the selected Song to the service.')
+                'Add the selected song to the service.')
         }
         self.setPluginUiTextStrings(tooltips)