lp:~trb143/openlp/trans31032017

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp/2.4 at revision 2683

Raoul Snyman: Approve on 2017-03-31

Tomas Groth: Approve on 2017-03-31

Diff: 5422 lines (+812/-812)

29 files modified

resources/i18n/af.ts (+28/-28)
resources/i18n/bg.ts (+28/-28)
resources/i18n/cs.ts (+28/-28)
resources/i18n/da.ts (+28/-28)
resources/i18n/de.ts (+28/-28)
resources/i18n/el.ts (+28/-28)
resources/i18n/en.ts (+28/-28)
resources/i18n/en_GB.ts (+28/-28)
resources/i18n/en_ZA.ts (+28/-28)
resources/i18n/es.ts (+28/-28)
resources/i18n/et.ts (+28/-28)
resources/i18n/fi.ts (+28/-28)
resources/i18n/fr.ts (+28/-28)
resources/i18n/hu.ts (+28/-28)
resources/i18n/id.ts (+28/-28)
resources/i18n/ja.ts (+28/-28)
resources/i18n/ko.ts (+28/-28)
resources/i18n/lt.ts (+28/-28)
resources/i18n/nb.ts (+28/-28)
resources/i18n/nl.ts (+28/-28)
resources/i18n/pl.ts (+28/-28)
resources/i18n/pt_BR.ts (+28/-28)
resources/i18n/ru.ts (+28/-28)
resources/i18n/sk.ts (+28/-28)
resources/i18n/sv.ts (+28/-28)
resources/i18n/ta_LK.ts (+28/-28)
resources/i18n/th_TH.ts (+28/-28)
resources/i18n/zh_CN.ts (+28/-28)
resources/i18n/zh_TW.ts (+28/-28)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2683. By Tim Bentley on 2017-03-31

trans31032017

2682. By Simon Hanna on 2017-03-30

Backport songbeamer fix

2681. By Raoul Snyman on 2017-03-30

Disable the shortcut controls when an action has not been selected

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/custom-shortcuts-2.4 (revision 2681)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1952/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1863/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1804/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1530/
[SUCCESS] https://ci.openlp.io/job...

2680. By Raoul Snyman on 2017-03-28

Fix the author_type import properly

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/fix-author-type-2.4 (revision 2681)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1947/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1858/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1799/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1525/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Te...

2679. By Raoul Snyman on 2017-03-28

Fix a problem with loading Qt's translation files

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/fix-translations-2.4 (revision 2680)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1943/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1854/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1795/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1521/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windo...

2678. By Tim Bentley on 2017-03-25

Next set of translations

2677. By Raoul Snyman on 2017-03-22

Revert the database upgrade, fix a few more bugs, and add some tests.

Bugs fixed:
- Sometimes the timer goes off as OpenLP is shutting down, and the application has already been deleted (reported via support system)
- Fix opening the data folder (KDE thought the old way was an SMB share)
- Fix a problem with the new QMediaPlayer not controlling the playlist anymore

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/fix-db-upgrade-2.4 (revision 2681)
[...

2676. By Raoul Snyman on 2017-03-12

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/db-upgrades-2.4 (revision 2681)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1929/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1840/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1781/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1511/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1101/
[SUCCESS] https://ci.openlp.io/...

2675. By Raoul Snyman on 2017-03-02

- Fix SongSelect so that it detects the login URL
- Fix PresentationManager importer to handle weird XML
- Pull in OpenLP song importer fixes from Olli's branch

2674. By Raoul Snyman on 2017-03-02

Fix bug #1666005 and bug #1668994

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/off-by-one-2.4 (revision 2676)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1915/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1826/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1767/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1500/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/109...