Merge remote-tracking branch 'origin' into gsocSiddheshLang

Authored by siddhism.

Description

Merge remote-tracking branch 'origin' into gsocSiddheshLang

Merged Changes

CommitAuthorDetailsCommitted
696d3a4ad726l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Jun 13 2015
0319b6a1cabal10n daemon script
SVN_SILENT made messages (after extraction) 
Jun 13 2015
24c0b529a41ajjazeix
louis braille, missing qsTr 
Jun 12 2015
c8334ed35f3djjazeix
simplepaint, missing qsTr 
Jun 12 2015
842925650ed3jjazeix
fix typos 
Jun 12 2015
5414bcb52e70jjazeix
remove useless import 
Jun 12 2015
d14705854fefl10n daemon script
SVN_SILENT made messages (after extraction) 
Jun 12 2015
0440cb7a0fa1Burkhard Lück
Fix invalid json files reported by Scripty REVIEW:124070 
Jun 11 2015