rusackas commented on PR #34563: URL: https://github.com/apache/superset/pull/34563#issuecomment-4042097213
We resolved the merge conflicts in `superset/translations/fr/LC_MESSAGES/messages.po` and pushed the updated branch. The conflicts were between new theme translation entries added to `master` and this PR's fixes to malformed format strings. Both sets of changes have been preserved. Please review the conflict resolution, verify that `npm run translations` still compiles cleanly, and set it back to 'ready for review' when confirmed. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
