Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Translations update from Weblate #3500

Merged

Conversation

xwikiorgci
Copy link
Contributor

Translations update from Weblate for XWiki Platform/XWiki Core Resources.

Current translation status:

Weblate translation status

If a new locale is introduced by this pull request make sure to follow https://dev.xwiki.org/xwiki/bin/view/Community/L10N/SupportedLocales/#HNewlocalechecklist before applying it.

@github-actions github-actions bot added the backport stable-15.10.x Used for automatic backport to 15.10.x branch. label Sep 14, 2024
Currently translated at 100.0% (283 of 283 strings)

Translation: XWiki Platform/XWiki Platform - CKEditor - UI
Translate-URL: https://l10n.xwiki.org/projects/xwiki-platform/xwiki-platform-ckeditor-ui/de/
@xwikiorgci xwikiorgci force-pushed the weblate-xwiki-platform-xwiki-core-resources branch from f4b4840 to 2e574a5 Compare September 15, 2024 03:05
@surli surli merged commit ed12e75 into xwiki:master Sep 16, 2024
1 check passed
Copy link

The backport to stable-15.10.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-stable-15.10.x stable-15.10.x
# Navigate to the new working tree
cd .worktrees/backport-stable-15.10.x
# Create a new branch
git switch --create backport-3500-to-stable-15.10.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ed12e7550641b3444ffbe90185fa62b413585dee
# Push it to GitHub
git push --set-upstream origin backport-3500-to-stable-15.10.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-stable-15.10.x

Then, create a pull request where the base branch is stable-15.10.x and the compare/head branch is backport-3500-to-stable-15.10.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport stable-15.10.x Used for automatic backport to 15.10.x branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants