← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~frodus86/openlp/translate into lp:openlp

 

Frode Woldsund has proposed merging lp:~frodus86/openlp/translate into lp:openlp.

Requested reviews:
  Raoul Snyman (raoul-snyman): approve
  Jon Tibble (meths)
  Tim Bentley (trb143)


Replaced the last trUtf8() -> translate() 
Fixed the syntax on translate() functions that contained (u'%s') and  (u'...' ,u'..' %)
-- 
https://code.launchpad.net/~frodus86/openlp/translate/+merge/28124
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py	2010-06-19 18:29:18 +0000
+++ openlp/core/lib/mediamanageritem.py	2010-06-21 22:07:27 +0000
@@ -491,7 +491,7 @@
                 #Turn off the remote edit update message indicator
                 QtGui.QMessageBox.information(self,
                     translate('MediaManagerItem', 'Invalid Service Item'),
-                    translate(unicode('MediaManagerItem',
+                    unicode(translate('MediaManagerItem',
                         'You must select a %s service item.')) % self.title)
 
     def buildServiceItem(self, item=None):

=== modified file 'openlp/plugins/songusage/songusageplugin.py'

Follow ups