Merge "Translate custom clock names" into qt-r1-dev