New translation file format + fix watch bugs