[Openlp-core] [Merge] lp:~j-corwin/openlp/present into lp:openlp

2010-06-23 Thread Raoul Snyman
The proposal to merge lp:~j-corwin/openlp/present into lp:openlp has been updated. Status: Needs review => Rejected -- https://code.launchpad.net/~j-corwin/openlp/present/+merge/28357 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Ma

Re: [Openlp-core] [Merge] lp:~j-corwin/openlp/present into lp:openlp

2010-06-23 Thread Raoul Snyman
Review: Needs Fixing needs fixing I agree with Jon. BTW, I have VC++ Express installed. -- https://code.launchpad.net/~j-corwin/openlp/present/+merge/28357 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net

[Openlp-core] [Merge] lp:~trb143/openlp/192onl into lp:openlp

2010-06-23 Thread Raoul Snyman
The proposal to merge lp:~trb143/openlp/192onl into lp:openlp has been updated. Status: Needs review => Approved -- https://code.launchpad.net/~trb143/openlp/192onl/+merge/28334 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing l

Re: [Openlp-core] [Merge] lp:~trb143/openlp/192onl into lp:openlp

2010-06-23 Thread Raoul Snyman
Review: Approve approve Approved. -- https://code.launchpad.net/~trb143/openlp/192onl/+merge/28334 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.ne

Re: [Openlp-core] [Merge] lp:~j-corwin/openlp/present into lp:openlp

2010-06-23 Thread Jon Tibble
Review: Needs Fixing Looks good. Just need to tweak 379 and 390 - you can combine exceptions... except (type1, type2): return same_thing_for_both_exception_types -- https://code.launchpad.net/~j-corwin/openlp/present/+merge/28357 Your team OpenLP Core is subscribed to branch lp:openlp.

Re: [Openlp-core] [Merge] lp:~trb143/openlp/192onl into lp:openlp

2010-06-23 Thread Jon Tibble
Review: Approve -- https://code.launchpad.net/~trb143/openlp/192onl/+merge/28334 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : h

[Openlp-core] [Merge] lp:~j-corwin/openlp/present into lp:openlp

2010-06-23 Thread Jonathan Corwin
Jonathan Corwin has proposed merging lp:~j-corwin/openlp/present into lp:openlp. Requested reviews: OpenLP Core (openlp-core) Presentation changes: Coding standards Specific Exception catching in PptViewer and Powerpoint (Impress still to do) Fix Show Screen for PptViewer and Impress Small cha

Re: [Openlp-core] [Merge] lp:~frodus86/openlp/translate into lp:openlp

2010-06-23 Thread Martin Thompson
Would it be worth defining copyright_symbol=u'\u00a9'.encode('utf8') in openlp.py (or in some utility file) Then we can do 'Copyright' + openlp.copyright_symbol + ... etc. Makes the code a bit more legible? Cheers, Martin -- martinthomp...@openlp.org The day Microsoft makes something that

Re: [Openlp-core] [Merge] lp:~frodus86/openlp/translate into lp:openlp

2010-06-23 Thread Jonathan Corwin
Review: Needs Fixing Didn't work for me. My license tab on the About window shows: Copyright © 2004-2010 Raoul Snyman Portions copyright ©2004-2010... -- https://code.launchpad.net/~frodus86/openlp/translate/+merge/28299 Your team OpenLP Core is subscribed to branch lp:openlp.

[Openlp-core] [Merge] lp:~trb143/openlp/192onl into lp:openlp

2010-06-23 Thread Tim Bentley
Tim Bentley has proposed merging lp:~trb143/openlp/192onl into lp:openlp. Requested reviews: OpenLP Core (openlp-core) Minor updates -- https://code.launchpad.net/~trb143/openlp/192onl/+merge/28334 Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/192onl in

Re: [Openlp-core] [Merge] lp:~frodus86/openlp/translate into lp:openlp

2010-06-23 Thread Raoul Snyman
Review: Approve approve Good stuff. -- https://code.launchpad.net/~frodus86/openlp/translate/+merge/28299 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launc

[Openlp-core] [Merge] lp:~frodus86/openlp/translate into lp:openlp

2010-06-23 Thread Frode Woldsund
Frode Woldsund has proposed merging lp:~frodus86/openlp/translate into lp:openlp. Requested reviews: Raoul Snyman (raoul-snyman): approve Jonathan Corwin (j-corwin) Fixed the two last translate() functions in the trunk. Now all translate() functions should be correct. -- https://code.laun

[Openlp-core] [Merge] lp:~frodus86/openlp/translate into lp:openlp

2010-06-23 Thread Frode Woldsund
The proposal to merge lp:~frodus86/openlp/translate into lp:openlp has been updated. Status: Approved => Superseded -- https://code.launchpad.net/~frodus86/openlp/translate/+merge/28273 Your team OpenLP Core is subscribed to branch lp:openlp. ___

Re: [Openlp-core] [Merge] lp:~frodus86/openlp/translate into lp:openlp

2010-06-23 Thread Raoul Snyman
A hack instead of a solution? No thanks. -- https://code.launchpad.net/~frodus86/openlp/translate/+merge/28273 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.

Re: [Openlp-core] [Merge] lp:~frodus86/openlp/translate into lp:openlp

2010-06-23 Thread Jonathan Corwin
Of course we could just use '(c)' and translate it to © :) -- https://code.launchpad.net/~frodus86/openlp/translate/+merge/28273 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to :

Re: [Openlp-core] [Merge] lp:~frodus86/openlp/translate into lp:openlp

2010-06-23 Thread Raoul Snyman
Ah, found it... u'\u00a9'.encode('utf8') Frode, can you just fix this please? Fix it in the two places in openlp/core/ui/aboutdialog.py as well, please. See http://bazaar.launchpad.net/~openlp-core/openlp/trunk/annotate/694/openlp/core/ui/aboutdialog.py#L157 -- https://code.launchpad.net/~fr

Re: [Openlp-core] [Merge] lp:~frodus86/openlp/translate into lp:openlp

2010-06-23 Thread Jonathan Corwin
After my print test, I then tried the following, which seemed OK: >>> from PyQt4 import QtGui >>> print unicode(QtGui.QApplication.translate('abc', '\xa9')) © >>> print unicode(QtGui.QApplication.translate('abc', u'\xa9')) © -- https://code.launchpad.net/~frodus86/openlp/translate/+merge/28273 Yo

Re: [Openlp-core] [Merge] lp:~frodus86/openlp/translate into lp:openlp

2010-06-23 Thread Raoul Snyman
This is what I get: >>> print '\xa9' � >>> print u'\xa9' © I'm not too sure what we should do. I remember that back in the day we had a solution to this, but I can't remember what it was. I'll have to go digging through the revisions. -- https://code.launchpad.net/~frodus86/openlp/translate/+m

[Openlp-core] [Merge] lp:~frodus86/openlp/translate into lp:openlp

2010-06-23 Thread Jonathan Corwin
The proposal to merge lp:~frodus86/openlp/translate into lp:openlp has been updated. Status: Needs review => Approved -- https://code.launchpad.net/~frodus86/openlp/translate/+merge/28273 Your team OpenLP Core is subscribed to branch lp:openlp. __

Re: [Openlp-core] [Merge] lp:~frodus86/openlp/translate into lp:openlp

2010-06-23 Thread Jonathan Corwin
Review: Approve Done a few more tests, and am happy it is OK via translate() -- https://code.launchpad.net/~frodus86/openlp/translate/+merge/28273 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-c

Re: [Openlp-core] [Merge] lp:~frodus86/openlp/translate into lp:openlp

2010-06-23 Thread rimach
> ... Should have added that I'm not able to test it within the context of > OpenLP and translate() though, so if someone confirms this is OK in the app, > post a comment and I'll switch my Needs Fixing to an Approve. I have problems with Song import in general, but at editsongdialog.py (line 484

Re: [Openlp-core] [Merge] lp:~frodus86/openlp/translate into lp:openlp

2010-06-23 Thread Jonathan Corwin
... Should have added that I'm not able to test it within the context of OpenLP and translate() though, so if someone confirms this is OK in the app, post a comment and I'll switch my Needs Fixing to an Approve. -- https://code.launchpad.net/~frodus86/openlp/translate/+merge/28273 Your team Open

Re: [Openlp-core] [Merge] lp:~frodus86/openlp/translate into lp:openlp

2010-06-23 Thread Jonathan Corwin
Review: Needs Fixing I get an (R) rather than a (C) at my Windows python prompt if the u is removed. >>> print '\xa9' ® >>> print u'\xa9' © -- https://code.launchpad.net/~frodus86/openlp/translate/+merge/28273 Your team OpenLP Core is subscribed to branch lp:openlp.

Re: [Openlp-core] [Merge] lp:~frodus86/openlp/translate into lp:openlp

2010-06-23 Thread Raoul Snyman
Review: Approve approve Awesome. -- https://code.launchpad.net/~frodus86/openlp/translate/+merge/28273 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpa

[Openlp-core] [Merge] lp:~frodus86/openlp/translate into lp:openlp

2010-06-23 Thread Frode Woldsund
Frode Woldsund has proposed merging lp:~frodus86/openlp/translate into lp:openlp. Requested reviews: Raoul Snyman (raoul-snyman): needs fixing Fixed the two last translate() functions in the trunk. Now all translate() functions should be correct. -- https://code.launchpad.net/~frodus86/open

[Openlp-core] [Merge] lp:~frodus86/openlp/translate into lp:openlp

2010-06-23 Thread Frode Woldsund
The proposal to merge lp:~frodus86/openlp/translate into lp:openlp has been updated. Status: Rejected => Superseded -- https://code.launchpad.net/~frodus86/openlp/translate/+merge/28272 Your team OpenLP Core is subscribed to branch lp:openlp. ___

[Openlp-core] [Merge] lp:~frodus86/openlp/translate into lp:openlp

2010-06-23 Thread Raoul Snyman
The proposal to merge lp:~frodus86/openlp/translate into lp:openlp has been updated. Status: Needs review => Rejected -- https://code.launchpad.net/~frodus86/openlp/translate/+merge/28272 Your team OpenLP Core is subscribed to branch lp:openlp. __

Re: [Openlp-core] [Merge] lp:~frodus86/openlp/translate into lp:openlp

2010-06-23 Thread Raoul Snyman
Review: Needs Fixing needs fixing Lines 19 and 22 of the diff still contain u's in front of the strings. These need to be removed. -- https://code.launchpad.net/~frodus86/openlp/translate/+merge/28272 Your team OpenLP Core is subscribed to branch lp:openlp. __

[Openlp-core] [Merge] lp:~frodus86/openlp/translate into lp:openlp

2010-06-23 Thread Frode Woldsund
Frode Woldsund has proposed merging lp:~frodus86/openlp/translate into lp:openlp. Requested reviews: OpenLP Core (openlp-core) Fixed the two last translate() functions in the trunk. Now all translate() functions should be correct. -- https://code.launchpad.net/~frodus86/openlp/translate/+me