[Openlp-core] [Merge] lp:~googol-hush/openlp/fixes into lp:openlp

[Andreas Preikschat]

Andreas Preikschat has proposed merging lp:~googol-hush/openlp/fixes into 
lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)


I changed the string "Parameter(s)" to "Parameter" (because the alerts plugin 
does only support one parameter, as far as I know).
-- 
https://code.launchpad.net/~googol-hush/openlp/fixes/+merge/43256
Your team OpenLP Core is requested to review the proposed merge of 
lp:~googol-hush/openlp/fixes into lp:openlp.

=== modified file 'openlp/plugins/alerts/forms/alertdialog.py'
--- openlp/plugins/alerts/forms/alertdialog.py	2010-09-14 18:18:47 +0000
+++ openlp/plugins/alerts/forms/alertdialog.py	2010-12-09 17:46:39 +0000
@@ -128,7 +128,7 @@
         self.AlertEntryLabel.setText(
             translate('AlertsPlugin.AlertForm', 'Alert &text:'))
         self.AlertParameter.setText(
-            translate('AlertsPlugin.AlertForm', '&Parameter(s):'))
+            translate('AlertsPlugin.AlertForm', '&Parameter:'))
         self.NewButton.setText(
             translate('AlertsPlugin.AlertForm', '&New'))
         self.SaveButton.setText(

=== modified file 'openlp/plugins/songs/lib/songbeamerimport.py'
--- openlp/plugins/songs/lib/songbeamerimport.py	2010-11-28 13:41:50 +0000
+++ openlp/plugins/songs/lib/songbeamerimport.py	2010-12-09 17:46:39 +0000
@@ -42,18 +42,18 @@
         u'Chorus': u'C',
         u'Vers': u'V',
         u'Verse': u'V',
-        u'Strophe': u'V', 
+        u'Strophe': u'V',
         u'Intro': u'I',
         u'Coda': u'E',
         u'Ending': u'E',
         u'Bridge': u'B',
-        u'Interlude': u'B', 
+        u'Interlude': u'B',
         u'Zwischenspiel': u'B',
         u'Pre-Chorus': u'P',
-        u'Pre-Refrain': u'P', 
+        u'Pre-Refrain': u'P',
         u'Pre-Bridge': u'O',
         u'Pre-Coda': u'O',
-        u'Unbekannt': u'O', 
+        u'Unbekannt': u'O',
         u'Unknown': u'O'
         }
 

=== modified file 'resources/forms/alertdialog.ui'
--- resources/forms/alertdialog.ui	2010-09-14 18:18:47 +0000
+++ resources/forms/alertdialog.ui	2010-12-09 17:46:39 +0000
@@ -57,7 +57,7 @@
      <item row="1" column="0">
       <widget class="QLabel" name="AlertParameter">
        <property name="text">
-        <string>&amp;Parameter(s):</string>
+        <string>&amp;Parameter:</string>
        </property>
        <property name="buddy">
         <cstring>ParameterEdit</cstring>


_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to     : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help   : https://help.launchpad.net/ListHelp