Merge remote-tracking branch 'origin/Plasma/5.8'

Authored by lbeltrame on Sep 28 2016, 10:23 AM.

Description

Merge remote-tracking branch 'origin/Plasma/5.8'

Merged Changes

CommitAuthorDetailsCommitted
189546c2696aD2874antlarr
Renamed userPrompt to userPromptComponent and add userListComponent id 
Sep 28 2016
9a30e2be9eb3pino
i18n: handle strings in kdevtemplate files 
Sep 28 2016
fe974403da86pino
i18n: review string in kdevtemplate file 
Sep 28 2016