resolve merge proposal request

2010-05-12 23:44:00 +02:00 · 2010-05-12 23:44:00 +02:00 · eaef48e708
commit eaef48e708
parent 294b0abfc0
12 changed files with 441 additions and 311 deletions
--- a/resources/i18n/openlp_af.qm
+++ b/resources/i18n/openlp_af.qm
--- a/resources/i18n/openlp_de.qm
+++ b/resources/i18n/openlp_de.qm
--- a/resources/i18n/openlp_en.qm
+++ b/resources/i18n/openlp_en.qm
--- a/resources/i18n/openlp_en.ts
+++ b/resources/i18n/openlp_en.ts
--- a/resources/i18n/openlp_en_GB.qm
+++ b/resources/i18n/openlp_en_GB.qm
--- a/resources/i18n/openlp_en_ZA.qm
+++ b/resources/i18n/openlp_en_ZA.qm
--- a/resources/i18n/openlp_es.qm
+++ b/resources/i18n/openlp_es.qm
--- a/resources/i18n/openlp_hu.qm
+++ b/resources/i18n/openlp_hu.qm
--- a/resources/i18n/openlp_nb.qm
+++ b/resources/i18n/openlp_nb.qm
--- a/resources/i18n/openlp_pt_BR.qm
+++ b/resources/i18n/openlp_pt_BR.qm
--- a/resources/i18n/openlp_sv.qm
+++ b/resources/i18n/openlp_sv.qm
--- a/scripts/translation_utils.py
+++ b/scripts/translation_utils.py
@ -38,7 +38,8 @@ from PyQt4 import QtCore
 ignore_pathes = [u"./scripts", u"./openlp/core/test"]
 ignore_files = [u"setup.py"]
 translation_path = u"http://pootle.projecthq.biz/export/openlp/"
-translations = [  u"af"
+translations = [ u"en" 
+                , u"af"
                , u"en_ZA"
                , u"en_GB"
                , u"de"