From 476ba8eb1b6298791e74e2be1cc85068e3916e6e Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Sat, 25 Feb 2012 13:11:59 +0200 Subject: [PATCH] Fixed the copyright in the patch file which someone else missed. Regenerated the resource file. Fixed the copyright in the translation_utils.py script which someone else missed. Removed an unnecessary comment. --- openlp/core/ui/slidecontroller.py | 1 - scripts/resources.patch | 12 ++++++------ scripts/translation_utils.py | 12 ++++++------ 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 23f9ffc3c..04cb2b4a3 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -282,7 +282,6 @@ class SlideController(Controller): self.audioPauseItem = QtGui.QToolButton(self.toolbar) self.audioPauseItem.setIcon( QtGui.QIcon(u':/slides/media_playback_pause.png')) - #u'Pause Audio', , self.audioPauseItem.setText(translate('OpenLP.SlideController', 'Pause audio.')) self.audioPauseItem.setCheckable(True) diff --git a/scripts/resources.patch b/scripts/resources.patch index 3697a705a..8fa2edbe1 100644 --- a/scripts/resources.patch +++ b/scripts/resources.patch @@ -12,12 +12,12 @@ +############################################################################### +# OpenLP - Open Source Lyrics Projection # +# --------------------------------------------------------------------------- # -+# Copyright (c) 2008-2011 Raoul Snyman # -+# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael # -+# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # -+# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # -+# Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode # -+# Woldsund # ++# Copyright (c) 2008-2012 Raoul Snyman # ++# Portions copyright (c) 2008-2012 Tim Bentley, Gerald Britton, Jonathan # ++# Corwin, Michael Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, # ++# Armin Köhler, Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias # ++# Põldaru, Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, # ++# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund # +# --------------------------------------------------------------------------- # +# This program is free software; you can redistribute it and/or modify it # +# under the terms of the GNU General Public License as published by the Free # diff --git a/scripts/translation_utils.py b/scripts/translation_utils.py index 812258fe2..b60d7d425 100755 --- a/scripts/translation_utils.py +++ b/scripts/translation_utils.py @@ -5,12 +5,12 @@ ############################################################################### # OpenLP - Open Source Lyrics Projection # # --------------------------------------------------------------------------- # -# Copyright (c) 2008-2011 Raoul Snyman # -# Portions copyright (c) 2008-2011 Tim Bentley, Jonathan Corwin, Michael # -# Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, Armin Köhler, # -# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout, # -# Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode # -# Woldsund # +# Copyright (c) 2008-2012 Raoul Snyman # +# Portions copyright (c) 2008-2012 Tim Bentley, Gerald Britton, Jonathan # +# Corwin, Michael Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, # +# Armin Köhler, Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias # +# Põldaru, Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith, # +# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Frode Woldsund # # --------------------------------------------------------------------------- # # This program is free software; you can redistribute it and/or modify it # # under the terms of the GNU General Public License as published by the Free #