Trebuchet: CS translation

- added new for dynamic folders
- fixed typo

Change-Id: Ibe475403eb483424b9856a63b23fbf49bc2a4303
Merge "Trebuchet: CS translation" into cm-10.2