Better fix for message ordering issue
Align chapter title translations

 * align files to new format
 * add missing translations