openlp-core team mailing list archive

[Samuel Mehrbrodt <s.mehrbrodt@xxxxxxxxx>]

Samuel Mehrbrodt has proposed merging lp:~sam92/openlp/string-fixes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~sam92/openlp/string-fixes/+merge/220482

Fix some string errors and remove unused variable

lp:~sam92/openlp/string-fixes (revision 2384)
[SUCCESS] http://ci.openlp.org/job/Branch-01-Pull/459/
[SUCCESS] http://ci.openlp.org/job/Branch-02-Functional-Tests/415/
[SUCCESS] http://ci.openlp.org/job/Branch-03-Interface-Tests/360/
[SUCCESS] http://ci.openlp.org/job/Branch-04-Windows_Tests/321/
[SUCCESS] http://ci.openlp.org/job/Branch-05a-Code_Analysis/218/
[SUCCESS] http://ci.openlp.org/job/Branch-05b-Test_Coverage/92/
-- 
https://code.launchpad.net/~sam92/openlp/string-fixes/+merge/220482
Your team OpenLP Core is requested to review the proposed merge of lp:~sam92/openlp/string-fixes into lp:openlp.

=== modified file 'openlp/core/ui/themeform.py'
--- openlp/core/ui/themeform.py	2014-04-21 09:49:17 +0000
+++ openlp/core/ui/themeform.py	2014-05-21 15:14:20 +0000
@@ -18,11 +18,11 @@
 # Software Foundation; version 2 of the License.                              #
 #                                                                             #
 # This program is distributed in the hope that it will be useful, but WITHOUT #
-# AN_y WARRANT_y; without even the implied warranty of MERCHANTABILIT_y or       #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
 # more details.                                                               #
 #                                                                             #
-# _you should have received a copy of the GNU General Public License along     #
+# You should have received a copy of the GNU General Public License along     #
 # with this program; if not, write to the Free Software Foundation, Inc., 59  #
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
@@ -179,7 +179,7 @@
         if self.page(self.currentId()) == self.background_page and \
                 self.theme.background_type == background_image and is_not_image_file(self.theme.background_filename):
             QtGui.QMessageBox.critical(self, translate('OpenLP.ThemeWizard', 'Background Image Empty'),
-                                       translate('OpenLP.ThemeWizard', '_you have not selected a '
+                                       translate('OpenLP.ThemeWizard', 'You have not selected a '
                                                  'background image. Please select one before continuing.'))
             return False
         else:

=== modified file 'openlp/plugins/songs/lib/cclifileimport.py'
--- openlp/plugins/songs/lib/cclifileimport.py	2014-04-12 20:19:22 +0000
+++ openlp/plugins/songs/lib/cclifileimport.py	2014-05-21 15:14:20 +0000
@@ -63,7 +63,6 @@
         for filename in self.import_source:
             filename = str(filename)
             log.debug('Importing CCLI File: %s', filename)
-            lines = []
             if os.path.isfile(filename):
                 detect_file = open(filename, 'r')
                 detect_content = detect_file.read(2048)
@@ -250,7 +249,7 @@
                 # e.g. For use solely with the SongSelect Terms of Use.
             All rights Reserved.  www.ccli.com
             CCLI Licence number of user
-                # e.g. CCL-Liedlizenznummer: 14 / CCLI License No. 14
+                # e.g. CCLI-Liedlizenznummer: 14 / CCLI License No. 14
 
         """
         log.debug('TXT file text: %s', text_list)

=== modified file 'openlp/plugins/songs/lib/db.py'
--- openlp/plugins/songs/lib/db.py	2014-04-21 14:40:54 +0000
+++ openlp/plugins/songs/lib/db.py	2014-05-21 15:14:20 +0000
@@ -74,10 +74,10 @@
     WordsAndMusic = 'words+music'
     Translation = 'translation'
     Types = {
-        Words: translate('OpenLP.Ui', 'Words'),
-        Music: translate('OpenLP.Ui', 'Music'),
-        WordsAndMusic: translate('OpenLP.Ui', 'Words and Music'),
-        Translation: translate('OpenLP.Ui', 'Translation')
+        Words: translate('SongsPlugin.AuthorType', 'Words', 'Author who wrote the lyrics of a song'),
+        Music: translate('SongsPlugin.AuthorType', 'Music', 'Author who wrote the music of a song'),
+        WordsAndMusic: translate('SongsPlugin.AuthorType', 'Author who wrote both lyrics and music of a song'),
+        Translation: translate('SongsPlugin.AuthorType', 'Translation', 'Author who translated the song')
     }
 
 

=== modified file 'openlp/plugins/songs/lib/xml.py'
--- openlp/plugins/songs/lib/xml.py	2014-05-03 12:56:58 +0000
+++ openlp/plugins/songs/lib/xml.py	2014-05-21 15:14:20 +0000
@@ -664,7 +664,7 @@
         # OpenLyrics 0.8 uses <br/> for new lines. Append text from "lines" element to verse text.
         if version > '0.7':
             text = self._process_lines_mixed_content(element)
-        # OpenLyrics version <= 0.7 contais <line> elements to represent lines. First child element is tested.
+        # OpenLyrics version <= 0.7 contains <line> elements to represent lines. First child element is tested.
         else:
             # Loop over the "line" elements removing comments and chords.
             for line in element: