Andreas Traczyk authored Oct 23, 2017 and Kateryna Kostiuk committed Oct 23, 2017

- Reverts commit ffe39be9
- Adds missing generated strings from commit d8b60072

...

Change-Id: I16c502b349f34c605c15b98a449fff9556520b29
Reviewed-by: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>