Merge "Update strings" into qt-dev