Trebuchet: CS translation

- added conversations folder message

Change-Id: Iaf4c4ed9a67831ecfe68ffe21769db51e4873d87
Merge "Trebuchet: CS translation" into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2