Merge branch 'Plasma/5.4'

Authored by lliehu.

Description

Merge branch 'Plasma/5.4'

Merged Changes

CommitAuthorDetailsCommitted
6ff699636160lliehu
Fix TRANSLATION_DOMAIN to match the name in Messages.sh 
Aug 9 2015