**i18n-check** <details> <summary>Errors occurred when merging changes from your branch with the Weblate branch.</summary> ``` warning: skipped previously applied commit b918acdc6 warning: skipped previously applied commit 967a66cf7 hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/34) Auto-merging src/ui/units/dash/containers/Body/Body.tsx CONFLICT (content): Merge conflict in src/ui/units/dash/containers/Body/Body.tsx Auto-merging src/ui/units/dash/containers/FixedHeader/FixedHeader.scss CONFLICT (content): Merge conflict in src/ui/units/dash/containers/FixedHeader/FixedHeader.scss Auto-merging src/ui/units/dash/containers/FixedHeader/FixedHeader.tsx CONFLICT (content): Merge conflict in src/ui/units/dash/containers/FixedHeader/FixedHeader.tsx error: could not apply 08c3a9fbb... Redesign dash fixed header hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 08c3a9fbb... Redesign dash fixed header (1) ``` </details> **Resolve conflicts according to instructions** 1. Switch to the current branch associated with this pull request. ``` git checkout CHARTS-10604 ``` 2. Add Weblate as remote. And remove previous upstream with the same name: ``` git remote remove weblate 2> /dev/null git remote add weblate https://weblate.gravity-ui.com/git/datalens/charts-10604-1863/chartkit-1863/ git -c http.sslVerify=false remote update weblate ``` 3. Merge Weblate changes: ``` git merge weblate/CHARTS-10604 ``` 4. Resolve conflicts: ``` edit ... git add ... git commit ``` 5. Push changes to upstream repository, Weblate will fetch merge from there: ``` git push origin ```