resolve merge proposal request

This commit is contained in:
rimach 2010-05-12 23:44:00 +02:00
parent 294b0abfc0
commit eaef48e708
12 changed files with 441 additions and 311 deletions

Binary file not shown.

Binary file not shown.

BIN
resources/i18n/openlp_en.qm Normal file

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -38,7 +38,8 @@ from PyQt4 import QtCore
ignore_pathes = [u"./scripts", u"./openlp/core/test"] ignore_pathes = [u"./scripts", u"./openlp/core/test"]
ignore_files = [u"setup.py"] ignore_files = [u"setup.py"]
translation_path = u"http://pootle.projecthq.biz/export/openlp/" translation_path = u"http://pootle.projecthq.biz/export/openlp/"
translations = [ u"af" translations = [ u"en"
, u"af"
, u"en_ZA" , u"en_ZA"
, u"en_GB" , u"en_GB"
, u"de" , u"de"