lp:~suutari-olli/openlp/rename_Powerpoint_to_PowerPoint

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:openlp

Tim Bentley: Disapprove on 2015-11-15

Diff: 912 lines (+123/-123)

39 files modified

openlp/plugins/presentations/lib/mediaitem.py (+1/-1)
openlp/plugins/presentations/lib/powerpointcontroller.py (+10/-10)
openlp/plugins/presentations/lib/pptviewcontroller.py (+1/-1)
openlp/plugins/presentations/lib/presentationcontroller.py (+1/-1)
openlp/plugins/presentations/lib/presentationtab.py (+2/-2)
openlp/plugins/presentations/presentationplugin.py (+2/-2)
openlp/plugins/songs/lib/importers/openoffice.py (+1/-1)
resources/i18n/af.ts (+2/-2)
resources/i18n/bg.ts (+2/-2)
resources/i18n/cs.ts (+3/-3)
resources/i18n/da.ts (+3/-3)
resources/i18n/de.ts (+3/-3)
resources/i18n/el.ts (+2/-2)
resources/i18n/en.ts (+3/-3)
resources/i18n/en_GB.ts (+3/-3)
resources/i18n/en_ZA.ts (+3/-3)
resources/i18n/es.ts (+2/-2)
resources/i18n/et.ts (+3/-3)
resources/i18n/fi.ts (+3/-3)
resources/i18n/fr.ts (+2/-2)
resources/i18n/hu.ts (+3/-3)
resources/i18n/id.ts (+2/-2)
resources/i18n/ja.ts (+2/-2)
resources/i18n/ko.ts (+2/-2)
resources/i18n/lt.ts (+3/-3)
resources/i18n/nb.ts (+3/-3)
resources/i18n/nl.ts (+4/-4)
resources/i18n/pl.ts (+3/-3)
resources/i18n/pt_BR.ts (+2/-2)
resources/i18n/ru.ts (+2/-2)
resources/i18n/sk.ts (+3/-3)
resources/i18n/sv.ts (+3/-3)
resources/i18n/ta_LK.ts (+2/-2)
resources/i18n/th_TH.ts (+2/-2)
resources/i18n/zh_CN.ts (+2/-2)
resources/i18n/zh_TW.ts (+3/-3)
tests/functional/openlp_plugins/presentations/test_mediaitem.py (+2/-2)
tests/functional/openlp_plugins/presentations/test_powerpointcontroller.py (+24/-24)
tests/functional/openlp_plugins/presentations/test_pptviewcontroller.py (+4/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2567. By Azaziah on 2015-11-11

At the moment PowerPoint is shown as Powerpoint in OLP ui.
This branch renames Powerpoint to PowerPoint in all files.
Total occurances replaced: 126
The all small powerpoint is left un-touched.

2566. By Tim Bentley on 2015-11-05

First merge for 2.4.

A Number of small bug fixes which could be done in 2.2.
Clean up all the 2.0 to 2.2 migrations stuff.
Create a 2.2 to 2.4 migration for settings.
Fix problems with the Tag test so you do not need to restart a branch each time we do a release.

lp:~trb143/openlp/bugs-2_4b (revision 2578)
[SUCCESS] https//ci.openlp.io/job/Branch-01-Pull/1164/
[SUCCESS] https//ci.openlp.io/job/Branch-02-Functional-Tests/1087/
[SUCCESS] https//ci.openlp.io/job/Branch-03-Interface-Tests/1028/...

2565. By Tim Bentley on 2015-11-04

Fix the pep 8 text.

lp:~trb143/openlp/bug-about (revision 2566)
[SUCCESS] https//ci.openlp.io/job/Branch-01-Pull/1170/
[SUCCESS] https//ci.openlp.io/job/Branch-02-Functional-Tests/1093/
[SUCCESS] https//ci.openlp.io/job/Branch-03-Interface-Tests/1034/
[SUCCESS] https//ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/881/
[SUCCESS] https//ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/477/
[SUCCESS] https//ci.openlp.io/job/Branch-05a-Code_Analysis/597/
[SUCCESS] https//ci.openlp.io/j...

2564. By Tomas Groth on 2015-11-02

Made ZionWorx importer work under python3, fixes bug 1510282.
Improved WorshipCenter Pro import, support more fields and verse types.

2563. By Tim Bentley on 2015-11-02

Refactor the about dialog so it is not possible for translators to break OpenLP.

2562. By Tim Bentley on 2015-10-17

Release 2.2

2561. By Tim Bentley on 2015-10-16

Fixed translations by removing ../../

Last set of translations before 2.2 this weekend.

2560. By Tomas Groth on 2015-10-15

Ignore close event in maindisplay unless it is trigger by OpenLP itself. Ignores ALT+F4 on windows.

2559. By Raoul Snyman on 2015-10-14

"Let's download things once only, instead of 3 times."

2558. By Tomas Groth on 2015-10-13

Make 2 texts translatable.
Remove unneeded quotes from commit message in the merge-script.