Merge lp://qastaging/~raoul-snyman/openlp/fix-translations-2.4 into lp://qastaging/openlp

Text conflict in .bzrignore
Conflict adding file CHANGELOG.rst.  Moved existing file to CHANGELOG.rst.moved.
Text conflict in openlp/.version
Text conflict in openlp/core/__init__.py
Text conflict in openlp/core/common/__init__.py
Contents conflict in openlp/core/common/historycombobox.py
Contents conflict in openlp/core/lib/colorbutton.py
Contents conflict in openlp/core/lib/dockwidget.py
Contents conflict in openlp/core/lib/listwidgetwithdnd.py
Text conflict in openlp/core/lib/projector/constants.py
Text conflict in openlp/core/lib/projector/pjlink1.py
Contents conflict in openlp/core/lib/spelltextedit.py
Contents conflict in openlp/core/lib/toolbar.py
Contents conflict in openlp/core/lib/treewidgetwithdnd.py
Text conflict in openlp/core/resources.py
Text conflict in openlp/core/ui/aboutdialog.py
Text conflict in openlp/core/ui/exceptionform.py
Contents conflict in openlp/core/ui/listpreviewwidget.py
Text conflict in openlp/core/ui/maindisplay.py
Text conflict in openlp/core/ui/mainwindow.py
Text conflict in openlp/core/ui/media/systemplayer.py
Contents conflict in openlp/core/ui/mediadockmanager.py
Text conflict in openlp/core/ui/projector/manager.py
Text conflict in openlp/core/ui/projector/sourceselectform.py
Text conflict in openlp/core/ui/settingsdialog.py
Contents conflict in openlp/core/ui/wizard.py
Conflict adding files to openlp/core/utils.  Created directory.
Conflict because openlp/core/utils is not versioned, but has versioned children.  Versioned directory.
Contents conflict in openlp/core/utils/__init__.py
Contents conflict in openlp/core/utils/actions.py
Contents conflict in openlp/core/utils/db.py
Contents conflict in openlp/core/utils/languagemanager.py
Contents conflict in openlp/plugins/bibles/forms/bibleupgradeform.py
Text conflict in openlp/plugins/bibles/lib/importers/http.py
Text conflict in openlp/plugins/bibles/lib/importers/zefania.py
Text conflict in openlp/plugins/bibles/lib/mediaitem.py
Text conflict in openlp/plugins/presentations/lib/pdfcontroller.py
Text conflict in openlp/plugins/remotes/html/index.html
Contents conflict in openlp/plugins/remotes/html/jquery.js
Contents conflict in openlp/plugins/remotes/html/jquery.min.js
Contents conflict in openlp/plugins/remotes/html/jquery.mobile.js
Contents conflict in openlp/plugins/remotes/html/jquery.mobile.min.css
Contents conflict in openlp/plugins/remotes/html/jquery.mobile.min.js
Contents conflict in openlp/plugins/remotes/html/main.css
Contents conflict in openlp/plugins/remotes/html/main.js
Contents conflict in openlp/plugins/remotes/html/openlp.css
Contents conflict in openlp/plugins/remotes/html/openlp.js
Contents conflict in openlp/plugins/remotes/html/stage.css
Contents conflict in openlp/plugins/remotes/html/stage.js
Text conflict in openlp/plugins/remotes/lib/httpserver.py
Text conflict in openlp/plugins/remotes/lib/remotetab.py
Text conflict in openlp/plugins/songs/lib/__init__.py
Text conflict in openlp/plugins/songs/lib/importers/easyworship.py
Text conflict in openlp/plugins/songs/lib/importers/mediashout.py
Text conflict in openlp/plugins/songs/lib/importers/openlp.py
Text conflict in openlp/plugins/songs/lib/importers/presentationmanager.py
Text conflict in openlp/plugins/songs/lib/importers/songbeamer.py
Text conflict in openlp/plugins/songs/lib/importers/videopsalm.py
Text conflict in openlp/plugins/songs/lib/mediaitem.py
Text conflict in openlp/plugins/songs/lib/songselect.py
Text conflict in openlp/plugins/songs/lib/upgrade.py
Text conflict in resources/i18n/af.ts
Text conflict in resources/i18n/bg.ts
Text conflict in resources/i18n/cs.ts
Text conflict in resources/i18n/da.ts
Text conflict in resources/i18n/de.ts
Text conflict in resources/i18n/el.ts
Text conflict in resources/i18n/en.ts
Text conflict in resources/i18n/en_GB.ts
Text conflict in resources/i18n/en_ZA.ts
Text conflict in resources/i18n/es.ts
Text conflict in resources/i18n/et.ts
Text conflict in resources/i18n/fi.ts
Text conflict in resources/i18n/fr.ts
Text conflict in resources/i18n/hu.ts
Text conflict in resources/i18n/id.ts
Text conflict in resources/i18n/ja.ts
Text conflict in resources/i18n/ko.ts
Text conflict in resources/i18n/lt.ts
Text conflict in resources/i18n/nb.ts
Text conflict in resources/i18n/nl.ts
Text conflict in resources/i18n/pl.ts
Text conflict in resources/i18n/pt_BR.ts
Text conflict in resources/i18n/ru.ts
Text conflict in resources/i18n/sk.ts
Text conflict in resources/i18n/sv.ts
Text conflict in resources/i18n/ta_LK.ts
Text conflict in resources/i18n/th_TH.ts
Text conflict in resources/i18n/zh_CN.ts
Text conflict in resources/i18n/zh_TW.ts
Conflict adding file resources/images/ios_app_qr.png.  Moved existing file to resources/images/ios_app_qr.png.moved.
Text conflict in scripts/translation_utils.py
Conflict adding file tests/functional/openlp_core/__init__.py.  Moved existing file to tests/functional/openlp_core/__init__.py.moved.
Text conflict in tests/functional/openlp_core/test_init.py
Text conflict in tests/functional/openlp_core_common/test_projector_utilities.py
Text conflict in tests/functional/openlp_core_common/test_registryproperties.py
Contents conflict in tests/functional/openlp_core_lib/test_color_button.py
Text conflict in tests/functional/openlp_core_lib/test_htmlbuilder.py
Text conflict in tests/functional/openlp_core_lib/test_projector_pjlink1.py
Text conflict in tests/functional/openlp_core_ui/test_aboutform.py
Text conflict in tests/functional/openlp_core_ui/test_firsttimeform.py
Contents conflict in tests/functional/openlp_core_ui/test_listpreviewwidget.py
Text conflict in tests/functional/openlp_core_ui/test_mainwindow.py
Text conflict in tests/functional/openlp_core_ui/test_servicemanager.py
Text conflict in tests/functional/openlp_core_ui/test_settingsform.py
Conflict adding file tests/functional/openlp_core_ui/test_shortcutlistdialog.py.  Moved existing file to tests/functional/openlp_core_ui/test_shortcutlistdialog.py.moved.
Conflict adding file tests/functional/openlp_core_ui/test_themetab.py.  Moved existing file to tests/functional/openlp_core_ui/test_themetab.py.moved.
Conflict adding file tests/functional/openlp_core_ui_media/test_systemplayer.py.  Moved existing file to tests/functional/openlp_core_ui_media/test_systemplayer.py.moved.
Conflict adding files to tests/functional/openlp_core_utils.  Created directory.
Conflict because tests/functional/openlp_core_utils is not versioned, but has versioned children.  Versioned directory.
Contents conflict in tests/functional/openlp_core_utils/__init__.py
Contents conflict in tests/functional/openlp_core_utils/test_actions.py
Contents conflict in tests/functional/openlp_core_utils/test_db.py
Contents conflict in tests/functional/openlp_core_utils/test_first_time.py
Contents conflict in tests/functional/openlp_core_utils/test_init.py
Contents conflict in tests/functional/openlp_core_utils/test_utils.py
Conflict adding file tests/functional/openlp_plugins/bibles/test_manager.py.  Moved existing file to tests/functional/openlp_plugins/bibles/test_manager.py.moved.
Text conflict in tests/functional/openlp_plugins/presentations/test_pdfcontroller.py
Text conflict in tests/functional/openlp_plugins/remotes/test_router.py
Text conflict in tests/functional/openlp_plugins/songs/test_editsongform.py
Text conflict in tests/functional/openlp_plugins/songs/test_lib.py
Conflict adding file tests/functional/openlp_plugins/songs/test_openlpimporter.py.  Moved existing file to tests/functional/openlp_plugins/songs/test_openlpimporter.py.moved.
Text conflict in tests/functional/openlp_plugins/songs/test_songselect.py
Text conflict in tests/functional/openlp_plugins/songusage/test_songusage.py
Contents conflict in tests/interfaces/openlp_core_common/test_historycombobox.py
Text conflict in tests/interfaces/openlp_core_lib/test_pluginmanager.py
Contents conflict in tests/interfaces/openlp_core_ui/test_listpreviewwidget.py
Conflict adding files to tests/interfaces/openlp_core_utils.  Created directory.
Conflict because tests/interfaces/openlp_core_utils is not versioned, but has versioned children.  Versioned directory.
Contents conflict in tests/interfaces/openlp_core_utils/__init__.py
Contents conflict in tests/interfaces/openlp_core_utils/test_utils.py
Conflict adding file tests/interfaces/openlp_plugins/bibles/forms/__init__.py.  Moved existing file to tests/interfaces/openlp_plugins/bibles/forms/__init__.py.moved.
Text conflict in tests/interfaces/openlp_plugins/bibles/forms/test_bibleimportform.py
Text conflict in tests/interfaces/openlp_plugins/custom/forms/test_customform.py
Conflict adding file tests/interfaces/openlp_plugins/songs/forms/test_songmaintenanceform.py.  Moved existing file to tests/interfaces/openlp_plugins/songs/forms/test_songmaintenanceform.py.moved.
Conflict adding file tests/resources/easyslidessongs/Export_2017-01-12_BB.json.  Moved existing file to tests/resources/easyslidessongs/Export_2017-01-12_BB.json.moved.
Conflict adding file tests/resources/easyslidessongs/Export_2017-01-12_BB.xml.  Moved existing file to tests/resources/easyslidessongs/Export_2017-01-12_BB.xml.moved.
Conflict adding file tests/resources/opensongsongs/Amazing Grace with bad CCLI.  Moved existing file to tests/resources/opensongsongs/Amazing Grace with bad CCLI.moved.
Conflict adding file tests/resources/opensongsongs/Amazing Grace without CCLI.json.  Moved existing file to tests/resources/opensongsongs/Amazing Grace without CCLI.json.moved.
Contents conflict in tests/resources/presentationmanagersongs/Agnus Dei.sng
Conflict adding file tests/resources/songshowplussongs/cleanse-me.json.  Moved existing file to tests/resources/songshowplussongs/cleanse-me.json.moved.
Conflict adding file tests/resources/songshowplussongs/cleanse-me.sbsong.  Moved existing file to tests/resources/songshowplussongs/cleanse-me.sbsong.moved.
Conflict adding file tests/resources/videopsalmsongs/as-safe-a-stronghold2.json.  Moved existing file to tests/resources/videopsalmsongs/as-safe-a-stronghold2.json.moved.
Conflict adding file tests/resources/videopsalmsongs/videopsalm-as-safe-a-stronghold2.json.  Moved existing file to tests/resources/videopsalmsongs/videopsalm-as-safe-a-stronghold2.json.moved.