Update strings.

bzr-revno: 1050

resources/i18n/af.ts

@@ -3626,11 +3626,6 @@ The content encoding is not UTF-8.</source>
         <source>Importing %s...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/songimportwizard.py" line="546"/>
-        <source>The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="openlp/plugins/songs/forms/songimportform.py" line="222"/>
         <source>No EasyWorship Song Database Selected</source>
@@ -3651,6 +3646,11 @@ The content encoding is not UTF-8.</source>
         <source>EasyWorship</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/songimportwizard.py" line="546"/>
+        <source>The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongsPlugin.MediaItem</name>

resources/i18n/de.ts

@@ -3581,11 +3581,6 @@ The content encoding is not UTF-8.</source>
         <source>Importing %s...</source>
         <translation></translation>
     </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/songimportwizard.py" line="546"/>
-        <source>The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="openlp/plugins/songs/forms/songimportform.py" line="222"/>
         <source>No EasyWorship Song Database Selected</source>
@@ -3606,6 +3601,11 @@ The content encoding is not UTF-8.</source>
         <source>EasyWorship</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/songimportwizard.py" line="546"/>
+        <source>The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongsPlugin.MediaItem</name>

resources/i18n/en.ts

@@ -3405,6 +3405,16 @@ The content encoding is not UTF-8.</source>
         <source>You need to add at least one document or presentation file to import from.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/songimportform.py" line="222"/>
+        <source>No EasyWorship Song Database Selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/songimportform.py" line="222"/>
+        <source>You need to select an EasyWorship song database file to import from.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="openlp/plugins/songs/forms/songimportform.py" line="265"/>
         <source>Select OpenLP 2.0 Database File</source>
@@ -3440,6 +3450,11 @@ The content encoding is not UTF-8.</source>
         <source>Select Document/Presentation Files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/songimportform.py" line="339"/>
+        <source>Select EasyWorship Database File</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="openlp/plugins/songs/forms/songimportform.py" line="392"/>
         <source>Starting import...</source>
@@ -3515,6 +3530,11 @@ The content encoding is not UTF-8.</source>
         <source>Generic Document/Presentation</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/songimportwizard.py" line="525"/>
+        <source>EasyWorship</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="openlp/plugins/songs/forms/songimportwizard.py" line="579"/>
         <source>Filename:</source>
@@ -3585,26 +3605,6 @@ The content encoding is not UTF-8.</source>
         <source>Importing %s...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/songimportform.py" line="222"/>
-        <source>No EasyWorship Song Database Selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/songimportform.py" line="222"/>
-        <source>You need to select an EasyWorship song database file to import from.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/songimportform.py" line="339"/>
-        <source>Select EasyWorship Database File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/songimportwizard.py" line="525"/>
-        <source>EasyWorship</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SongsPlugin.MediaItem</name>

resources/i18n/en_GB.ts

@@ -3757,11 +3757,6 @@ The content encoding is not UTF-8.</translation>
         <source>Importing %s...</source>
         <translation>Importing %s...</translation>
     </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/songimportwizard.py" line="546"/>
-        <source>The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="openlp/plugins/songs/forms/songimportform.py" line="222"/>
         <source>No EasyWorship Song Database Selected</source>
@@ -3782,6 +3777,11 @@ The content encoding is not UTF-8.</translation>
         <source>EasyWorship</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/songimportwizard.py" line="546"/>
+        <source>The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongsPlugin.MediaItem</name>

resources/i18n/en_ZA.ts

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="1.1" language="en_ZA">
+<!DOCTYPE TS>
+<TS version="2.0" language="en_ZA">
 <context>
     <name>AlertsPlugin</name>
     <message>
@@ -206,7 +207,14 @@ Book Chapter:Verse-Verse,Verse-Verse
 Book Chapter:Verse-Verse,Chapter:Verse-Verse
 Book Chapter:Verse-Chapter:Verse
 </source>
-        <translation type="unfinished"></translation>
+        <translation>Your scripture reference is either not supported by OpenLP or is invalid. Please make sure your reference conforms to one of the following patterns:
+
+Book Chapter
+Book Chapter-Chapter
+Book Chapter:Verse-Verse
+Book Chapter:Verse-Verse,Verse-Verse
+Book Chapter:Verse-Verse,Chapter:Verse-Verse
+Book Chapter:Verse-Chapter:Verse</translation>
     </message>
 </context>
 <context>
@@ -544,12 +552,12 @@ Changes do not affect verses already in the service.</translation>
     <message>
         <location filename="openlp/plugins/bibles/forms/importwizardform.py" line="181"/>
         <source>You need to set a copyright for your Bible. Bibles in the Public Domain need to be marked as such.</source>
-        <translation type="unfinished"></translation>
+        <translation>You need to set a copyright for your Bible. Bibles in the Public Domain need to be marked as such.</translation>
     </message>
     <message>
         <location filename="openlp/plugins/bibles/forms/importwizardform.py" line="191"/>
         <source>This Bible already exists. Please import a different Bible or first delete the existing one.</source>
-        <translation type="unfinished"></translation>
+        <translation>This Bible already exists. Please import a different Bible or first delete the existing one.</translation>
     </message>
 </context>
 <context>
@@ -1085,8 +1093,8 @@ Built With
     </message>
     <message>
         <location filename="openlp/core/ui/aboutdialog.py" line="173"/>
-        <source>Copyright &#xa9; 2004-2010 Raoul Snyman
+        <source>Copyright © 2004-2010 Raoul Snyman
-Portions copyright &#xa9; 2004-2010 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten Tinggaard
+Portions copyright © 2004-2010 Tim Bentley, Jonathan Corwin, Michael Gorven, Scott Guerrieri, Christian Richter, Maikel Stuivenberg, Martin Thompson, Jon Tibble, Carsten Tinggaard
 
 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 Software Foundation; version 2 of the License.
 
@@ -2662,7 +2670,7 @@ The content encoding is not UTF-8.</translation>
     <message>
         <location filename="openlp/core/ui/servicemanager.py" line="884"/>
         <source>Your item cannot be displayed as the plugin required to display it is missing or inactive</source>
-        <translation type="unfinished"></translation>
+        <translation>Your item cannot be displayed as the plugin required to display it is missing or inactive</translation>
     </message>
 </context>
 <context>
@@ -2746,7 +2754,7 @@ The content encoding is not UTF-8.</translation>
     <message>
         <location filename="openlp/core/ui/slidecontroller.py" line="210"/>
         <source>Edit and reload song preview</source>
-        <translation type="unfinished"></translation>
+        <translation>Edit and reload song preview</translation>
     </message>
 </context>
 <context>
@@ -2934,12 +2942,12 @@ The content encoding is not UTF-8.</translation>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="242"/>
         <source>Theme %s is used in the %s plugin.</source>
-        <translation type="unfinished"></translation>
+        <translation>Theme %s is used in the %s plugin.</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/thememanager.py" line="249"/>
         <source>Theme %s is used by the service manager.</source>
-        <translation type="unfinished"></translation>
+        <translation>Theme %s is used by the service manager.</translation>
     </message>
 </context>
 <context>
@@ -3247,7 +3255,7 @@ The content encoding is not UTF-8.</translation>
     <message>
         <location filename="openlp/plugins/songs/forms/authorsform.py" line="96"/>
         <source>You have not set a display name for the author, combine the first and last names?</source>
-        <translation type="unfinished"></translation>
+        <translation>You have not set a display name for the author, combine the first and last names?</translation>
     </message>
 </context>
 <context>
@@ -3354,7 +3362,7 @@ The content encoding is not UTF-8.</translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/forms/editsongdialog.py" line="462"/>
-        <source>&#xa9;</source>
+        <source>©</source>
         <translation>©</translation>
     </message>
     <message>
@@ -3766,22 +3774,22 @@ The content encoding is not UTF-8.</translation>
     <message>
         <location filename="openlp/plugins/songs/forms/songimportform.py" line="222"/>
         <source>No EasyWorship Song Database Selected</source>
-        <translation type="unfinished"></translation>
+        <translation>No EasyWorship Song Database Selected</translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/forms/songimportform.py" line="222"/>
         <source>You need to select an EasyWorship song database file to import from.</source>
-        <translation type="unfinished"></translation>
+        <translation>You need to select an EasyWorship song database file to import from.</translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/forms/songimportform.py" line="339"/>
         <source>Select EasyWorship Database File</source>
-        <translation type="unfinished"></translation>
+        <translation>Select EasyWorship Database File</translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/forms/songimportwizard.py" line="525"/>
         <source>EasyWorship</source>
-        <translation type="unfinished"></translation>
+        <translation>EasyWorship</translation>
     </message>
 </context>
 <context>
@@ -3904,7 +3912,7 @@ The content encoding is not UTF-8.</translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/lib/songimport.py" line="81"/>
-        <source>&#xa9;</source>
+        <source>©</source>
         <translation>©</translation>
     </message>
 </context>
@@ -4112,7 +4120,7 @@ The content encoding is not UTF-8.</translation>
     <message>
         <location filename="openlp/plugins/songs/forms/topicsform.py" line="51"/>
         <source>You need to type in a topic name.</source>
-        <translation type="unfinished"></translation>
+        <translation>You need to type in a topic name.</translation>
     </message>
 </context>
 <context>

resources/i18n/es.ts

@@ -3580,11 +3580,6 @@ The content encoding is not UTF-8.</source>
         <source>Importing %s...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/songimportwizard.py" line="546"/>
-        <source>The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="openlp/plugins/songs/forms/songimportform.py" line="222"/>
         <source>No EasyWorship Song Database Selected</source>
@@ -3605,6 +3600,11 @@ The content encoding is not UTF-8.</source>
         <source>EasyWorship</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/songimportwizard.py" line="546"/>
+        <source>The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongsPlugin.MediaItem</name>

resources/i18n/hu.ts

@@ -3755,11 +3755,6 @@ A tartalom kódolása nem UTF-8.</translation>
         <source>Importing %s...</source>
         <translation>Importálás %s...</translation>
     </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/songimportwizard.py" line="546"/>
-        <source>The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="openlp/plugins/songs/forms/songimportform.py" line="222"/>
         <source>No EasyWorship Song Database Selected</source>
@@ -3780,6 +3775,11 @@ A tartalom kódolása nem UTF-8.</translation>
         <source>EasyWorship</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/songimportwizard.py" line="546"/>
+        <source>The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongsPlugin.MediaItem</name>

resources/i18n/ko.ts

@@ -3580,11 +3580,6 @@ The content encoding is not UTF-8.</source>
         <source>Importing %s...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/songimportwizard.py" line="546"/>
-        <source>The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="openlp/plugins/songs/forms/songimportform.py" line="222"/>
         <source>No EasyWorship Song Database Selected</source>
@@ -3605,6 +3600,11 @@ The content encoding is not UTF-8.</source>
         <source>EasyWorship</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/songimportwizard.py" line="546"/>
+        <source>The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongsPlugin.MediaItem</name>

resources/i18n/nb.ts

@@ -3580,11 +3580,6 @@ The content encoding is not UTF-8.</source>
         <source>Importing %s...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/songimportwizard.py" line="546"/>
-        <source>The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="openlp/plugins/songs/forms/songimportform.py" line="222"/>
         <source>No EasyWorship Song Database Selected</source>
@@ -3605,6 +3600,11 @@ The content encoding is not UTF-8.</source>
         <source>EasyWorship</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/songimportwizard.py" line="546"/>
+        <source>The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongsPlugin.MediaItem</name>

resources/i18n/pt_BR.ts

@@ -3618,11 +3618,6 @@ A codificação do conteúdo não é UTF-8.</translation>
         <source>Importing %s...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/songimportwizard.py" line="546"/>
-        <source>The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="openlp/plugins/songs/forms/songimportform.py" line="222"/>
         <source>No EasyWorship Song Database Selected</source>
@@ -3643,6 +3638,11 @@ A codificação do conteúdo não é UTF-8.</translation>
         <source>EasyWorship</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/songimportwizard.py" line="546"/>
+        <source>The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongsPlugin.MediaItem</name>

resources/i18n/sv.ts

@@ -3580,11 +3580,6 @@ The content encoding is not UTF-8.</source>
         <source>Importing %s...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="openlp/plugins/songs/forms/songimportwizard.py" line="546"/>
-        <source>The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="openlp/plugins/songs/forms/songimportform.py" line="222"/>
         <source>No EasyWorship Song Database Selected</source>
@@ -3605,6 +3600,11 @@ The content encoding is not UTF-8.</source>
         <source>EasyWorship</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="openlp/plugins/songs/forms/songimportwizard.py" line="546"/>
+        <source>The OpenLyrics importer has not yet been developed, but as you can see, we are still intending to do so. Hopefully it will be in the next release.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SongsPlugin.MediaItem</name>

scripts/translation_utils.py

@@ -86,7 +86,9 @@ class CommandStack(object):
         return len(self.data)
 
     def __getitem__(self, index):
-        if self.data[index].get(u'arguments'):
+        if not index in self.data:
+            return None
+        elif self.data[index].get(u'arguments'):
             return self.data[index][u'command'], self.data[index][u'arguments']
         else:
             return self.data[index][u'command']
@@ -111,6 +113,21 @@ class CommandStack(object):
     def reset(self):
         self.current_index = 0
 
+    def arguments(self):
+        if self.data[self.current_index - 1].get(u'arguments'):
+            return self.data[self.current_index - 1][u'arguments']
+        else:
+            return []
+
+    def __repr__(self):
+        results = []
+        for item in self.data:
+            if item.get(u'arguments'):
+                results.append(str((item[u'command'], item[u'arguments'])))
+            else:
+                results.append(str((item[u'command'], )))
+        return u'[%s]' % u', '.join(results)
+
 
 def print_verbose(text):
     """
@@ -233,7 +250,7 @@ def update_translations():
 def generate_binaries():
     print u'Generate the related *.qm files'
     if not os.path.exists(os.path.join(os.path.abspath(u'..'), u'openlp.pro')):
-        print u'You have no generated a project file yet, please run this ' + \
+        print u'You have not generated a project file yet, please run this ' + \
             u'script with the -p option. It is also recommended that you ' + \
             u'this script with the -u option to update the translation ' + \
             u'files as well.'
@@ -261,13 +278,15 @@ def create_translation(language):
         The language file to create.
     """
     print "Create new Translation File"
+    if not language.endswith(u'.ts'):
+        language += u'.ts'
     filename = os.path.join(os.path.abspath(u'..'), u'resources', u'i18n', language)
     download_file(u'en.ts', filename)
-    print u'\n** Please Note **\n'
+    print u'   ** Please Note **'
-    print u'In order to get this file into OpenLP and onto the Pootle ' + \
+    print u'   In order to get this file into OpenLP and onto the Pootle ' + \
         u'translation server you will need to subscribe to the OpenLP' + \
         u'Translators mailing list, and request that your language file ' + \
-        u'be added to the project.\n'
+        u'be added to the project.'
     print u'   Done'
 
 def process_stack(command_stack):
@@ -291,7 +310,7 @@ def process_stack(command_stack):
             elif command == Command.Generate:
                 generate_binaries()
             elif command == Command.Create:
-                command, arguments = command_stack[command_stack.current_index]
+                arguments = command_stack.arguments()
                 create_translation(*arguments)
         print u'Finished processing commands.'
     else:
@@ -306,7 +325,7 @@ def main():
     parser = OptionParser(usage=usage)
     parser.add_option('-d', '--download-ts', dest='download',
         action='store_true', help='download language files from Pootle')
-    parser.add_option('-c', '--create', dest=u'create', metavar='LANG',
+    parser.add_option('-c', '--create', dest='create', metavar='LANG',
         help='create a new translation file for language LANG, e.g. "en_GB"')
     parser.add_option('-p', '--prepare', dest='prepare', action='store_true',
         help='generate a project file, used to update the translations')